diff --git a/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt b/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt
deleted file mode 100644
index d8aaf7a95a..0000000000
--- a/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Categories:Multimedia
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/ucam-cl-dtg/barcodebox
-Issue Tracker:https://github.com/ucam-cl-dtg/barcodebox/issues
-
-Auto Name:Barcode Box 2
-Summary:Barcode scan history
-Description:
-You will need [[com.google.zxing.client.android]] to be installed.
-
-Records a list of barcodes when you scan them and reminds you if you've seen it
-before. Useful for remembering which books you've read or things you've seen in
-the shop. It features a rapid scanning mode, and allows to export the history of
-barcodes to CSV.
-.
-
-Repo Type:git
-Repo:https://github.com/ucam-cl-dtg/barcodebox.git
-
-Build:1.1.1,3
-    commit=a78f80f87298bb1cba0d80bc699ba2841be66e2a
-
-Build:1.1.2,4
-    commit=e18c34b4fc035c
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.1.2
-Current Version Code:4
diff --git a/metadata/uk.ac.cam.cl.dtg.android.barcodebox.yml b/metadata/uk.ac.cam.cl.dtg.android.barcodebox.yml
new file mode 100644
index 0000000000..2a2220a1b9
--- /dev/null
+++ b/metadata/uk.ac.cam.cl.dtg.android.barcodebox.yml
@@ -0,0 +1,32 @@
+Categories:
+  - Multimedia
+License: Apache-2.0
+SourceCode: https://github.com/ucam-cl-dtg/barcodebox
+IssueTracker: https://github.com/ucam-cl-dtg/barcodebox/issues
+
+AutoName: Barcode Box 2
+Summary: Barcode scan history
+Description: |-
+    You will need [[com.google.zxing.client.android]] to be installed.
+
+    Records a list of barcodes when you scan them and reminds you if you've seen it
+    before. Useful for remembering which books you've read or things you've seen in
+    the shop. It features a rapid scanning mode, and allows to export the history of
+    barcodes to CSV.
+
+RepoType: git
+Repo: https://github.com/ucam-cl-dtg/barcodebox.git
+
+Builds:
+  - versionName: 1.1.1
+    versionCode: 3
+    commit: a78f80f87298bb1cba0d80bc699ba2841be66e2a
+
+  - versionName: 1.1.2
+    versionCode: 4
+    commit: e18c34b4fc035c
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 1.1.2
+CurrentVersionCode: 4
diff --git a/metadata/uk.ac.ed.inf.mandelbrotmaps.txt b/metadata/uk.ac.ed.inf.mandelbrotmaps.txt
deleted file mode 100644
index 00f3d124c7..0000000000
--- a/metadata/uk.ac.ed.inf.mandelbrotmaps.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Categories:Science & Education
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/withad/Mandelbrot-Maps-on-Android
-Issue Tracker:https://github.com/withad/Mandelbrot-Maps-on-Android/issues
-
-Auto Name:Mandelbrot Maps
-Summary:Fractal viewer
-Description:
-Generates the Mandelbrot fractal, and at each point, allows you to see the
-associated Julia set fractal.
-.
-
-Repo Type:git
-Repo:https://github.com/withad/Mandelbrot-Maps-on-Android.git
-
-Build:1.01,2
-    commit=32f397669847c23a
-    subdir=MandelbrotMapsAndroid
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.01
-Current Version Code:2
diff --git a/metadata/uk.ac.ed.inf.mandelbrotmaps.yml b/metadata/uk.ac.ed.inf.mandelbrotmaps.yml
new file mode 100644
index 0000000000..a579e1970d
--- /dev/null
+++ b/metadata/uk.ac.ed.inf.mandelbrotmaps.yml
@@ -0,0 +1,25 @@
+Categories:
+  - Science & Education
+License: GPL-3.0-only
+SourceCode: https://github.com/withad/Mandelbrot-Maps-on-Android
+IssueTracker: https://github.com/withad/Mandelbrot-Maps-on-Android/issues
+
+AutoName: Mandelbrot Maps
+Summary: Fractal viewer
+Description: |-
+    Generates the Mandelbrot fractal, and at each point, allows you to see the
+    associated Julia set fractal.
+
+RepoType: git
+Repo: https://github.com/withad/Mandelbrot-Maps-on-Android.git
+
+Builds:
+  - versionName: '1.01'
+    versionCode: 2
+    commit: 32f397669847c23a
+    subdir: MandelbrotMapsAndroid
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.01'
+CurrentVersionCode: 2
diff --git a/metadata/uk.co.ashtonbrsc.android.intentintercept.txt b/metadata/uk.co.ashtonbrsc.android.intentintercept.txt
deleted file mode 100644
index c7433fbb49..0000000000
--- a/metadata/uk.co.ashtonbrsc.android.intentintercept.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-Categories:Development
-License:Apache-2.0
-Web Site:http://www.intrications.com
-Source Code:https://github.com/intrications/intent-intercept
-Issue Tracker:https://github.com/intrications/intent-intercept/issues
-
-Auto Name:Intent Intercept
-Summary:View inter-app communication
-Description:
-'''Currently unmaintained''': A maintained fork is available here
-[[de.k3b.android.intentintercept]].
-
-This app attempts to intercept as many intents as possible in order to examine
-their contents. This helps when trying to develop an app that reacts to a
-particular intent.
-
-Some details of the intent can now be edited before resending it.
-.
-
-Repo Type:git
-Repo:https://github.com/intrications/intent-intercept.git
-
-Build:2.0,100
-    commit=965ec1d9ed
-    subdir=IntentIntercept
-    submodules=yes
-    update=.,../contrib/ActionBarSherlock/library,../contrib/android-switch-backport
-    target=android-16
-
-Build:2.01,101
-    commit=2a5e768b6e
-    subdir=IntentIntercept
-    submodules=yes
-    target=android-16
-
-Build:2.0.3,103
-    commit=70a65774ac9a
-    subdir=IntentIntercept
-
-Build:2.0.4,204
-    commit=1e1aeb93a1c6
-    subdir=IntentIntercept
-
-Build:2.1.1,211
-    commit=b80adf538593b3c5c5de9f30ee4e1d01c16e4c8a
-    subdir=app
-    gradle=yes
-
-Build:2.2.0,220
-    commit=816649e7b6f2985917603eb1c77f5208c48120cf
-    subdir=app
-    gradle=yes
-
-Build:2.2.1,221
-    commit=5b239839e4e11074b9a61f7693f2b02fe950d722
-    subdir=app
-    gradle=yes
-
-Build:2.2.2,222
-    commit=68cc43d280b69c0422bd15681580a474ad57473c
-    subdir=app
-    gradle=yes
-
-Build:2.2.3,223
-    commit=v2.2.3
-    subdir=app
-    gradle=yes
-
-Build:2.2.4,224
-    commit=v2.2.4
-    subdir=app
-    gradle=yes
-
-Maintainer Notes:
-Move to archive in the future in favor of [[de.k3b.android.intentintercept]]?
-.
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:2.2.4
-Current Version Code:224
diff --git a/metadata/uk.co.ashtonbrsc.android.intentintercept.yml b/metadata/uk.co.ashtonbrsc.android.intentintercept.yml
new file mode 100644
index 0000000000..6f9cf1592a
--- /dev/null
+++ b/metadata/uk.co.ashtonbrsc.android.intentintercept.yml
@@ -0,0 +1,99 @@
+Categories:
+  - Development
+License: Apache-2.0
+WebSite: http://www.intrications.com
+SourceCode: https://github.com/intrications/intent-intercept
+IssueTracker: https://github.com/intrications/intent-intercept/issues
+
+AutoName: Intent Intercept
+Summary: View inter-app communication
+Description: |-
+    '''Currently unmaintained''': A maintained fork is available here
+    [[de.k3b.android.intentintercept]].
+
+    This app attempts to intercept as many intents as possible in order to examine
+    their contents. This helps when trying to develop an app that reacts to a
+    particular intent.
+
+    Some details of the intent can now be edited before resending it.
+
+RepoType: git
+Repo: https://github.com/intrications/intent-intercept.git
+
+Builds:
+  - versionName: '2.0'
+    versionCode: 100
+    commit: 965ec1d9ed
+    subdir: IntentIntercept
+    submodules: true
+    androidupdate:
+      - .
+      - ../contrib/ActionBarSherlock/library
+      - ../contrib/android-switch-backport
+    target: android-16
+
+  - versionName: '2.01'
+    versionCode: 101
+    commit: 2a5e768b6e
+    subdir: IntentIntercept
+    submodules: true
+    target: android-16
+
+  - versionName: 2.0.3
+    versionCode: 103
+    commit: 70a65774ac9a
+    subdir: IntentIntercept
+
+  - versionName: 2.0.4
+    versionCode: 204
+    commit: 1e1aeb93a1c6
+    subdir: IntentIntercept
+
+  - versionName: 2.1.1
+    versionCode: 211
+    commit: b80adf538593b3c5c5de9f30ee4e1d01c16e4c8a
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.0
+    versionCode: 220
+    commit: 816649e7b6f2985917603eb1c77f5208c48120cf
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.1
+    versionCode: 221
+    commit: 5b239839e4e11074b9a61f7693f2b02fe950d722
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.2
+    versionCode: 222
+    commit: 68cc43d280b69c0422bd15681580a474ad57473c
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.3
+    versionCode: 223
+    commit: v2.2.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.4
+    versionCode: 224
+    commit: v2.2.4
+    subdir: app
+    gradle:
+      - yes
+
+MaintainerNotes: Move to archive in the future in favor of [[de.k3b.android.intentintercept]]?
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 2.2.4
+CurrentVersionCode: 224
diff --git a/metadata/uk.co.bitethebullet.android.token.txt b/metadata/uk.co.bitethebullet.android.token.txt
deleted file mode 100644
index 3daab36261..0000000000
--- a/metadata/uk.co.bitethebullet.android.token.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/markmcavoy/androidtoken
-Issue Tracker:https://github.com/markmcavoy/androidtoken/issues
-
-Auto Name:Android Token
-Summary:OATH software tokens
-Description:
-Turning a mobile phone into a One Time Password (OTP) generation device which
-can be used in the place of hardware tokens.
-
-Support for provisioning tokens using the KeyUriFormat and QR codes as well as
-manual creation.
-
-Can optionally be protected with a PIN to stop unauthorised access to the
-software tokens.
-
-Supports both HOTP (Event Tokens) and TOTP (Time Tokens) specifications.
-.
-
-Repo Type:git
-Repo:https://github.com/markmcavoy/androidtoken.git
-
-Build:2.02,4
-    commit=b35d1f5
-    subdir=src
-    target=android-16
-
-Build:2.10,5
-    commit=c4ae1ccb4f19fd55d59a436b800f855c3160f26b
-    subdir=src
-    target=android-16
-
-Build:2.11,6
-    commit=d61974f49399e1b38c5a3f3202cfadea55691eb3
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:2.11
-Current Version Code:6
diff --git a/metadata/uk.co.bitethebullet.android.token.yml b/metadata/uk.co.bitethebullet.android.token.yml
new file mode 100644
index 0000000000..dee264ad29
--- /dev/null
+++ b/metadata/uk.co.bitethebullet.android.token.yml
@@ -0,0 +1,46 @@
+Categories:
+  - System
+License: GPL-3.0-only
+SourceCode: https://github.com/markmcavoy/androidtoken
+IssueTracker: https://github.com/markmcavoy/androidtoken/issues
+
+AutoName: Android Token
+Summary: OATH software tokens
+Description: |-
+    Turning a mobile phone into a One Time Password (OTP) generation device which
+    can be used in the place of hardware tokens.
+
+    Support for provisioning tokens using the KeyUriFormat and QR codes as well as
+    manual creation.
+
+    Can optionally be protected with a PIN to stop unauthorised access to the
+    software tokens.
+
+    Supports both HOTP (Event Tokens) and TOTP (Time Tokens) specifications.
+
+RepoType: git
+Repo: https://github.com/markmcavoy/androidtoken.git
+
+Builds:
+  - versionName: '2.02'
+    versionCode: 4
+    commit: b35d1f5
+    subdir: src
+    target: android-16
+
+  - versionName: '2.10'
+    versionCode: 5
+    commit: c4ae1ccb4f19fd55d59a436b800f855c3160f26b
+    subdir: src
+    target: android-16
+
+  - versionName: '2.11'
+    versionCode: 6
+    commit: d61974f49399e1b38c5a3f3202cfadea55691eb3
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '2.11'
+CurrentVersionCode: 6
diff --git a/metadata/uk.co.busydoingnothing.catverbs.txt b/metadata/uk.co.busydoingnothing.catverbs.txt
deleted file mode 100644
index e01e7b2c6d..0000000000
--- a/metadata/uk.co.busydoingnothing.catverbs.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Categories:Science & Education
-License:GPL-2.0-only
-Author Name:Neil Roberts
-Web Site:
-Source Code:https://github.com/bpeel/catverbs
-Issue Tracker:https://github.com/bpeel/catverbs/issues
-
-Auto Name:Catverbs
-Summary:Catalan verb conjugation
-Description:
-Catverbs can be used as a reference for the conjugation of most catalan verbs.
-Its interface is in catalan as well.
-.
-
-Repo Type:git
-Repo:https://github.com/bpeel/catverbs
-
-Build:0.5,5
-    commit=0.5
-    target=android-14
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:0.5
-Current Version Code:5
diff --git a/metadata/uk.co.busydoingnothing.catverbs.yml b/metadata/uk.co.busydoingnothing.catverbs.yml
new file mode 100644
index 0000000000..4414a37a2d
--- /dev/null
+++ b/metadata/uk.co.busydoingnothing.catverbs.yml
@@ -0,0 +1,26 @@
+Categories:
+  - Science & Education
+License: GPL-2.0-only
+AuthorName: Neil Roberts
+SourceCode: https://github.com/bpeel/catverbs
+IssueTracker: https://github.com/bpeel/catverbs/issues
+
+AutoName: Catverbs
+Summary: Catalan verb conjugation
+Description: |-
+    Catverbs can be used as a reference for the conjugation of most catalan verbs.
+    Its interface is in catalan as well.
+
+RepoType: git
+Repo: https://github.com/bpeel/catverbs
+
+Builds:
+  - versionName: '0.5'
+    versionCode: 5
+    commit: '0.5'
+    target: android-14
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: '0.5'
+CurrentVersionCode: 5
diff --git a/metadata/uk.co.busydoingnothing.prevo.txt b/metadata/uk.co.busydoingnothing.prevo.txt
deleted file mode 100644
index 8fd3aac144..0000000000
--- a/metadata/uk.co.busydoingnothing.prevo.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-Categories:Reading
-License:GPL-2.0-only
-Author Name:Neil Roberts
-Web Site:http://www.busydoingnothing.co.uk/prevo
-Source Code:https://github.com/bpeel/prevo
-Issue Tracker:https://github.com/bpeel/prevo/issues
-
-Summary:Esperanto dictionary
-Description:
-PReVo is a portable version of Reta Vortaro (the free and libre Esperanto
-dictionary) for Android. It's usable without Internet access and is quickly
-searched with the keyboard.
-.
-
-Repo Type:git
-Repo:https://github.com/bpeel/prevo
-
-Build:0.13,13
-    commit=0.13
-    srclibs=Revo@db661ee97d,PrevoDB@f3ae246353
-    target=android-16
-    build=cp -r $$PrevoDB$$ . && \
-        cd PrevoDB && \
-        ./autogen.sh && \
-        make -j2 && \
-        cd .. && \
-        PrevoDB/src/prevodb -i $$Revo$$ -o .
-
-Build:0.14,14
-    commit=0.14
-    srclibs=Revo@9a103f4bc8,PrevoDB@f3ae246353
-    target=android-16
-    build=cp -r $$PrevoDB$$ . && \
-        cd PrevoDB && \
-        ./autogen.sh && \
-        make -j2 && \
-        cd .. && \
-        PrevoDB/src/prevodb -i $$Revo$$ -o .
-
-Build:0.15,15
-    commit=0.15
-    srclibs=Revo@efe9d51d47,PrevoDB@97835cbb50
-    target=android-16
-    build=cp -r $$PrevoDB$$ . && \
-        cd PrevoDB && \
-        ./autogen.sh && \
-        make -j2 && \
-        cd .. && \
-        PrevoDB/src/prevodb -i $$Revo$$ -o .
-
-Build:0.16,16
-    commit=0.16
-    srclibs=Revo@44b8c07590,PrevoDB@97835cbb50
-    target=android-16
-    build=cp -r $$PrevoDB$$ . && \
-        cd PrevoDB && \
-        ./autogen.sh && \
-        make -j`nproc` && \
-        cd .. && \
-        PrevoDB/src/prevodb -i $$Revo$$ -o .
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:0.16
-Current Version Code:16
diff --git a/metadata/uk.co.busydoingnothing.prevo.yml b/metadata/uk.co.busydoingnothing.prevo.yml
new file mode 100644
index 0000000000..96f908042d
--- /dev/null
+++ b/metadata/uk.co.busydoingnothing.prevo.yml
@@ -0,0 +1,82 @@
+Categories:
+  - Reading
+License: GPL-2.0-only
+AuthorName: Neil Roberts
+WebSite: http://www.busydoingnothing.co.uk/prevo
+SourceCode: https://github.com/bpeel/prevo
+IssueTracker: https://github.com/bpeel/prevo/issues
+
+Summary: Esperanto dictionary
+Description: |-
+    PReVo is a portable version of Reta Vortaro (the free and libre Esperanto
+    dictionary) for Android. It's usable without Internet access and is quickly
+    searched with the keyboard.
+
+RepoType: git
+Repo: https://github.com/bpeel/prevo
+
+Builds:
+  - versionName: '0.13'
+    versionCode: 13
+    commit: '0.13'
+    srclibs:
+      - Revo@db661ee97d
+      - PrevoDB@f3ae246353
+    target: android-16
+    build:
+      - cp -r $$PrevoDB$$ .
+      - cd PrevoDB
+      - ./autogen.sh
+      - make -j2
+      - cd ..
+      - PrevoDB/src/prevodb -i $$Revo$$ -o .
+
+  - versionName: '0.14'
+    versionCode: 14
+    commit: '0.14'
+    srclibs:
+      - Revo@9a103f4bc8
+      - PrevoDB@f3ae246353
+    target: android-16
+    build:
+      - cp -r $$PrevoDB$$ .
+      - cd PrevoDB
+      - ./autogen.sh
+      - make -j2
+      - cd ..
+      - PrevoDB/src/prevodb -i $$Revo$$ -o .
+
+  - versionName: '0.15'
+    versionCode: 15
+    commit: '0.15'
+    srclibs:
+      - Revo@efe9d51d47
+      - PrevoDB@97835cbb50
+    target: android-16
+    build:
+      - cp -r $$PrevoDB$$ .
+      - cd PrevoDB
+      - ./autogen.sh
+      - make -j2
+      - cd ..
+      - PrevoDB/src/prevodb -i $$Revo$$ -o .
+
+  - versionName: '0.16'
+    versionCode: 16
+    commit: '0.16'
+    srclibs:
+      - Revo@44b8c07590
+      - PrevoDB@97835cbb50
+    target: android-16
+    build:
+      - cp -r $$PrevoDB$$ .
+      - cd PrevoDB
+      - ./autogen.sh
+      - make -j`nproc`
+      - cd ..
+      - PrevoDB/src/prevodb -i $$Revo$$ -o .
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: '0.16'
+CurrentVersionCode: 16
diff --git a/metadata/uk.co.danieljarvis.android.flashback.txt b/metadata/uk.co.danieljarvis.android.flashback.txt
deleted file mode 100644
index 4d97228734..0000000000
--- a/metadata/uk.co.danieljarvis.android.flashback.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Categories:Phone & SMS
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/daj/flashback
-Issue Tracker:https://github.com/daj/flashback/issues
-
-Auto Name:Flashback
-Summary:Display caller history
-Description:
-When you receive a call the app displays the history of your interactions with
-the caller.
-.
-
-Repo Type:git
-Repo:https://github.com/daj/flashback.git
-
-Build:1.14,14
-    commit=33230
-    subdir=Flashback
-    gradle=yes
-
-Build:1.15,15
-    disable=not published
-
-Build:1.16,16
-    commit=5d9c4c4caf
-    subdir=Flashback
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.16
-Current Version Code:16
diff --git a/metadata/uk.co.danieljarvis.android.flashback.yml b/metadata/uk.co.danieljarvis.android.flashback.yml
new file mode 100644
index 0000000000..ac8fd01030
--- /dev/null
+++ b/metadata/uk.co.danieljarvis.android.flashback.yml
@@ -0,0 +1,38 @@
+Categories:
+  - Phone & SMS
+License: Apache-2.0
+SourceCode: https://github.com/daj/flashback
+IssueTracker: https://github.com/daj/flashback/issues
+
+AutoName: Flashback
+Summary: Display caller history
+Description: |-
+    When you receive a call the app displays the history of your interactions with
+    the caller.
+
+RepoType: git
+Repo: https://github.com/daj/flashback.git
+
+Builds:
+  - versionName: '1.14'
+    versionCode: 14
+    commit: '33230'
+    subdir: Flashback
+    gradle:
+      - yes
+
+  - versionName: '1.15'
+    versionCode: 15
+    disable: not published
+
+  - versionName: '1.16'
+    versionCode: 16
+    commit: 5d9c4c4caf
+    subdir: Flashback
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.16'
+CurrentVersionCode: 16
diff --git a/metadata/uk.co.jarofgreen.JustADamnCompass.txt b/metadata/uk.co.jarofgreen.JustADamnCompass.txt
deleted file mode 100644
index 46d53f0dbd..0000000000
--- a/metadata/uk.co.jarofgreen.JustADamnCompass.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Categories:Navigation
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/jarofgreen/Just-A-Damn-Compass
-Issue Tracker:https://github.com/jarofgreen/Just-A-Damn-Compass/issues
-
-Auto Name:Just A Damn Compass
-Summary:Simple Compass
-Description:
-A simple compass with no unnecessary extras.
-.
-
-Repo Type:git
-Repo:https://github.com/jarofgreen/Just-A-Damn-Compass.git
-
-Build:1.1,2
-    commit=32e3d60ecadac260f71da17a6cb4b22084c5bcc2
-    target=android-8
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.1
-Current Version Code:2
diff --git a/metadata/uk.co.jarofgreen.JustADamnCompass.yml b/metadata/uk.co.jarofgreen.JustADamnCompass.yml
new file mode 100644
index 0000000000..53594489ff
--- /dev/null
+++ b/metadata/uk.co.jarofgreen.JustADamnCompass.yml
@@ -0,0 +1,23 @@
+Categories:
+  - Navigation
+License: Apache-2.0
+SourceCode: https://github.com/jarofgreen/Just-A-Damn-Compass
+IssueTracker: https://github.com/jarofgreen/Just-A-Damn-Compass/issues
+
+AutoName: Just A Damn Compass
+Summary: Simple Compass
+Description: A simple compass with no unnecessary extras.
+
+RepoType: git
+Repo: https://github.com/jarofgreen/Just-A-Damn-Compass.git
+
+Builds:
+  - versionName: '1.1'
+    versionCode: 2
+    commit: 32e3d60ecadac260f71da17a6cb4b22084c5bcc2
+    target: android-8
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.1'
+CurrentVersionCode: 2
diff --git a/metadata/uk.co.keepawayfromfire.screens.txt b/metadata/uk.co.keepawayfromfire.screens.txt
deleted file mode 100644
index e21cce22af..0000000000
--- a/metadata/uk.co.keepawayfromfire.screens.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-Categories:System
-License:BSD-2-Clause
-Web Site:http://keepawayfromfire.co.uk/screens.html
-Source Code:https://github.com/Cj-Malone/Screens
-Issue Tracker:https://github.com/Cj-Malone/Screens/issues
-Changelog:https://raw.githubusercontent.com/Cj-Malone/Screens/HEAD/CHANGELOG.md
-
-Auto Name:Screens
-Summary:Multi Window Manager
-Description:
-Automatically enter split screen mode from launcher shortcuts and Quick Settings
-tiles.
-
-Screens allows you to quickly enter splitscreen mode with pre selected apps. It
-creates shortcuts that can be used from any launcher. This might be good for
-productivity or having SeriesGuide and Kore at the same time.
-
-This app uses Accessibility services. Accessibility services are required to
-enable Multi window automatically, if you don't want to provide this open source
-app with the permission you will need to manually hold the recents button when
-prompted.
-.
-
-Repo Type:git
-Repo:https://github.com/Cj-Malone/Screens
-Binaries:https://github.com/Cj-Malone/Screens/releases/download/v%v/uk.co.keepawayfromfire.screens-%v.apk
-
-Build:4,4
-    commit=v4
-    subdir=app
-    gradle=yes
-
-Build:5,5
-    commit=v5
-    subdir=app
-    gradle=yes
-
-Build:5.1,6
-    commit=v5.1
-    subdir=app
-    gradle=yes
-
-Build:5.1.1,7
-    commit=v5.1.1
-    subdir=app
-    gradle=yes
-
-Build:5.1.2,8
-    commit=v5.1.2
-    subdir=app
-    gradle=yes
-
-Build:6.0.0,9
-    disable=verification fails
-    commit=v6.0.0
-    subdir=app
-    gradle=yes
-
-Build:6.0.1,10
-    disable=Could not find com.android.tools.build:gradle:3.0.0
-    commit=v6.0.1
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:6.0.1
-Current Version Code:10
diff --git a/metadata/uk.co.keepawayfromfire.screens.yml b/metadata/uk.co.keepawayfromfire.screens.yml
new file mode 100644
index 0000000000..77dc3a05df
--- /dev/null
+++ b/metadata/uk.co.keepawayfromfire.screens.yml
@@ -0,0 +1,83 @@
+Categories:
+  - System
+License: BSD-2-Clause
+WebSite: http://keepawayfromfire.co.uk/screens.html
+SourceCode: https://github.com/Cj-Malone/Screens
+IssueTracker: https://github.com/Cj-Malone/Screens/issues
+Changelog: https://raw.githubusercontent.com/Cj-Malone/Screens/HEAD/CHANGELOG.md
+
+AutoName: Screens
+Summary: Multi Window Manager
+Description: |-
+    Automatically enter split screen mode from launcher shortcuts and Quick Settings
+    tiles.
+
+    Screens allows you to quickly enter splitscreen mode with pre selected apps. It
+    creates shortcuts that can be used from any launcher. This might be good for
+    productivity or having SeriesGuide and Kore at the same time.
+
+    This app uses Accessibility services. Accessibility services are required to
+    enable Multi window automatically, if you don't want to provide this open source
+    app with the permission you will need to manually hold the recents button when
+    prompted.
+
+RepoType: git
+Repo: https://github.com/Cj-Malone/Screens
+Binaries: https://github.com/Cj-Malone/Screens/releases/download/v%v/uk.co.keepawayfromfire.screens-%v.apk
+
+Builds:
+  - versionName: '4'
+    versionCode: 4
+    commit: v4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '5'
+    versionCode: 5
+    commit: v5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '5.1'
+    versionCode: 6
+    commit: v5.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.1.1
+    versionCode: 7
+    commit: v5.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.1.2
+    versionCode: 8
+    commit: v5.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 6.0.0
+    versionCode: 9
+    disable: verification fails
+    commit: v6.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 6.0.1
+    versionCode: 10
+    disable: Could not find com.android.tools.build:gradle:3.0.0
+    commit: v6.0.1
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 6.0.1
+CurrentVersionCode: 10
diff --git a/metadata/uk.co.yahoo.p1rpp.calendartrigger.txt b/metadata/uk.co.yahoo.p1rpp.calendartrigger.txt
deleted file mode 100644
index a950cfe210..0000000000
--- a/metadata/uk.co.yahoo.p1rpp.calendartrigger.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Categories:Time,System
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/rparkins999/CalendarTrigger
-Issue Tracker:https://github.com/rparkins999/CalendarTrigger/issues
-Changelog:https://github.com/rparkins999/CalendarTrigger/releases
-
-Auto Name:Calendar Trigger
-Summary:Trigger actions on calendar events
-Description:
-Trigger various actions on different types of calendar event, and handle
-overlapping events wanting different ringer states in a sensible way (the
-"quietest" state wins). Also the start and end actions for an event can be
-delayed until the device is in some particular state.
-.
-
-Repo Type:git
-Repo:https://github.com/rparkins999/CalendarTrigger
-
-Build:1.0,1
-    commit=v1.0b
-    subdir=app
-    gradle=yes
-
-Build:1.2.0,4
-    commit=v1.2.0
-    subdir=app
-    gradle=yes
-
-Build:2.0,6
-    commit=v2.0
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystoreProperties/d' build.gradle
-
-Build:2.2,7
-    commit=v2.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystoreProperties/d' build.gradle
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:2.2
-Current Version Code:7
diff --git a/metadata/uk.co.yahoo.p1rpp.calendartrigger.yml b/metadata/uk.co.yahoo.p1rpp.calendartrigger.yml
new file mode 100644
index 0000000000..cb311431e1
--- /dev/null
+++ b/metadata/uk.co.yahoo.p1rpp.calendartrigger.yml
@@ -0,0 +1,54 @@
+Categories:
+  - Time
+  - System
+License: GPL-3.0-or-later
+SourceCode: https://github.com/rparkins999/CalendarTrigger
+IssueTracker: https://github.com/rparkins999/CalendarTrigger/issues
+Changelog: https://github.com/rparkins999/CalendarTrigger/releases
+
+AutoName: Calendar Trigger
+Summary: Trigger actions on calendar events
+Description: |-
+    Trigger various actions on different types of calendar event, and handle
+    overlapping events wanting different ringer states in a sensible way (the
+    "quietest" state wins). Also the start and end actions for an event can be
+    delayed until the device is in some particular state.
+
+RepoType: git
+Repo: https://github.com/rparkins999/CalendarTrigger
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0b
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.0
+    versionCode: 4
+    commit: v1.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.0'
+    versionCode: 6
+    commit: v2.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
+
+  - versionName: '2.2'
+    versionCode: 7
+    commit: v2.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '2.2'
+CurrentVersionCode: 7
diff --git a/metadata/uk.org.boddie.android.weatherforecast.txt b/metadata/uk.org.boddie.android.weatherforecast.txt
deleted file mode 100644
index 121219256b..0000000000
--- a/metadata/uk.org.boddie.android.weatherforecast.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-Categories:Internet
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://bitbucket.org/dboddie/weather-forecast-android
-Issue Tracker:
-
-Summary:View weather forecasts from yr.no
-Description:
-This application downloads and displays weather forecasts from the yr.no
-service.
-.
-
-Repo Type:hg
-Repo:https://bitbucket.org/dboddie/weather-forecast-android
-
-Build:1.0.2,102
-    commit=1.0.2
-    sudo=apt-get install -y python-crypto python-pygments markdown python-markdown imagemagick pngquant python-cairosvg
-    output=output.apk
-    srclibs=duck@1.0.3
-    build=PYTHONPATH=$$duck$$ ./build.py output.apk
-
-Build:1.0.4,104
-    commit=1.0.4
-    sudo=apt-get install -y python-crypto python-pygments markdown python-markdown imagemagick pngquant python-cairosvg
-    output=output.apk
-    srclibs=duck@1.0.3
-    build=PYTHONPATH=$$duck$$ ./build.py output.apk
-
-Build:1.0.5,105
-    commit=1.0.5
-    sudo=apt-get install -y python-crypto python-pygments markdown python-markdown imagemagick pngquant python-cairosvg
-    output=output.apk
-    srclibs=duck@1.0.3
-    build=PYTHONPATH=$$duck$$ ./build.py output.apk
-
-Build:1.0.6,106
-    commit=1.0.6
-    sudo=apt-get install -y python-crypto python-pygments markdown python-markdown imagemagick pngquant python-cairosvg
-    output=output.apk
-    srclibs=duck@1.0.3
-    build=PYTHONPATH=$$duck$$ ./build.py output.apk
-
-Build:1.0.8,108
-    commit=1.0.8
-    sudo=apt-get install -y python-crypto python-pygments markdown python-markdown imagemagick pngquant python-cairosvg
-    output=output.apk
-    srclibs=duck@1.0.3
-    build=PYTHONPATH=$$duck$$ ./build.py output.apk
-
-Build:1.0.9,109
-    commit=1.0.9
-    sudo=apt-get install -y python-crypto python-pygments markdown python-markdown imagemagick pngquant python-cairosvg
-    output=output.apk
-    srclibs=duck@1.0.3
-    build=PYTHONPATH=$$duck$$ ./build.py output.apk
-
-Build:1.1.0,110
-    commit=1.1.0
-    sudo=apt-get install -y python-crypto python-pygments markdown python-markdown imagemagick pngquant python-cairosvg
-    output=output.apk
-    srclibs=duck@1.0.3
-    build=PYTHONPATH=$$duck$$ ./build.py output.apk
-
-Auto Update Mode:Version %v
-Update Check Mode:HTTP
-Update Check Data:https://bitbucket.org/dboddie/weather-forecast-android/raw/tip/build.py|version_code = "(.*)"|.|version = "(.*)"
-Current Version:1.1.0
-Current Version Code:110
diff --git a/metadata/uk.org.boddie.android.weatherforecast.yml b/metadata/uk.org.boddie.android.weatherforecast.yml
new file mode 100644
index 0000000000..90ce114809
--- /dev/null
+++ b/metadata/uk.org.boddie.android.weatherforecast.yml
@@ -0,0 +1,90 @@
+Categories:
+  - Internet
+License: GPL-3.0-or-later
+SourceCode: https://bitbucket.org/dboddie/weather-forecast-android
+
+Summary: View weather forecasts from yr.no
+Description: |-
+    This application downloads and displays weather forecasts from the yr.no
+    service.
+
+RepoType: hg
+Repo: https://bitbucket.org/dboddie/weather-forecast-android
+
+Builds:
+  - versionName: 1.0.2
+    versionCode: 102
+    commit: 1.0.2
+    sudo: apt-get install -y python-crypto python-pygments markdown python-markdown
+        imagemagick pngquant python-cairosvg
+    output: output.apk
+    srclibs:
+      - duck@1.0.3
+    build: PYTHONPATH=$$duck$$ ./build.py output.apk
+
+  - versionName: 1.0.4
+    versionCode: 104
+    commit: 1.0.4
+    sudo: apt-get install -y python-crypto python-pygments markdown python-markdown
+        imagemagick pngquant python-cairosvg
+    output: output.apk
+    srclibs:
+      - duck@1.0.3
+    build: PYTHONPATH=$$duck$$ ./build.py output.apk
+
+  - versionName: 1.0.5
+    versionCode: 105
+    commit: 1.0.5
+    sudo: apt-get install -y python-crypto python-pygments markdown python-markdown
+        imagemagick pngquant python-cairosvg
+    output: output.apk
+    srclibs:
+      - duck@1.0.3
+    build: PYTHONPATH=$$duck$$ ./build.py output.apk
+
+  - versionName: 1.0.6
+    versionCode: 106
+    commit: 1.0.6
+    sudo: apt-get install -y python-crypto python-pygments markdown python-markdown
+        imagemagick pngquant python-cairosvg
+    output: output.apk
+    srclibs:
+      - duck@1.0.3
+    build: PYTHONPATH=$$duck$$ ./build.py output.apk
+
+  - versionName: 1.0.8
+    versionCode: 108
+    commit: 1.0.8
+    sudo: apt-get install -y python-crypto python-pygments markdown python-markdown
+        imagemagick pngquant python-cairosvg
+    output: output.apk
+    srclibs:
+      - duck@1.0.3
+    build: PYTHONPATH=$$duck$$ ./build.py output.apk
+
+  - versionName: 1.0.9
+    versionCode: 109
+    commit: 1.0.9
+    sudo: apt-get install -y python-crypto python-pygments markdown python-markdown
+        imagemagick pngquant python-cairosvg
+    output: output.apk
+    srclibs:
+      - duck@1.0.3
+    build: PYTHONPATH=$$duck$$ ./build.py output.apk
+
+  - versionName: 1.1.0
+    versionCode: 110
+    commit: 1.1.0
+    sudo: apt-get install -y python-crypto python-pygments markdown python-markdown
+        imagemagick pngquant python-cairosvg
+    output: output.apk
+    srclibs:
+      - duck@1.0.3
+    build: PYTHONPATH=$$duck$$ ./build.py output.apk
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: HTTP
+UpdateCheckData: https://bitbucket.org/dboddie/weather-forecast-android/raw/tip/build.py|version_code
+    = "(.*)"|.|version = "(.*)"
+CurrentVersion: 1.1.0
+CurrentVersionCode: 110
diff --git a/metadata/uk.org.cardboardbox.wonderdroid.txt b/metadata/uk.org.cardboardbox.wonderdroid.txt
deleted file mode 100644
index 01b90c8568..0000000000
--- a/metadata/uk.org.cardboardbox.wonderdroid.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-AntiFeatures:UpstreamNonFree
-Categories:Games
-License:GPL-3.0-only
-Web Site:https://code.google.com/p/wonderdroid
-Source Code:https://code.google.com/p/wonderdroid/source
-Issue Tracker:
-
-Auto Name:WonderDroid
-Summary:Game emulator
-Description:
-Bandai WonderSwan (Mono & Color) emulator. Full instructions are on the website.
-
-The proprietary Google Admob library has been replaced with an open-source
-library that does nothing.
-
-Tracking: Crash reports are sent silently without user interaction.
-.
-
-Repo Type:git
-Repo:https://code.google.com/p/wonderdroid
-
-Build:1.8b2,36
-    commit=b75f439e745
-    subdir=wonderdroid
-    srclibs=MobAdMob@2d5736
-    prebuild=echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
-        echo "android.library=true" >> $$MobAdMob$$/project.properties && \
-        rm -f libs/GoogleAdMobAdsSdk-6.0.1.jar
-    buildjni=yes
-
-Build:1.8c,37
-    commit=1a14c45ffdeb
-    subdir=wonderdroid
-    srclibs=MobAdMob@2d5736
-    prebuild=echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
-        echo "android.library=true" >> $$MobAdMob$$/project.properties && \
-        rm -rf libs/GoogleAdMobAdsSdk-6.0.1.jar libs/*/
-    buildjni=yes
-
-Build:1.9,39
-    commit=5d92956205f5
-    subdir=wonderdroid
-    patch=jni.diff
-    srclibs=MobAdMob@3bd7888,ActionBarSherlock@4.4.0
-    prebuild=echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
-        echo "android.library.reference.2=$$ActionBarSherlock$$" >> project.properties && \
-        rm -rf libs/GoogleAdMobAdsSdk-6.0.1.jar
-    buildjni=yes
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.9
-Current Version Code:39
diff --git a/metadata/uk.org.cardboardbox.wonderdroid.yml b/metadata/uk.org.cardboardbox.wonderdroid.yml
new file mode 100644
index 0000000000..c4af3b2a20
--- /dev/null
+++ b/metadata/uk.org.cardboardbox.wonderdroid.yml
@@ -0,0 +1,68 @@
+AntiFeatures:
+  - UpstreamNonFree
+Categories:
+  - Games
+License: GPL-3.0-only
+WebSite: https://code.google.com/p/wonderdroid
+
+AutoName: WonderDroid
+Summary: Game emulator
+Description: |-
+    Bandai WonderSwan (Mono & Color) emulator. Full instructions are on the website.
+
+    The proprietary Google Admob library has been replaced with an open-source
+    library that does nothing.
+
+    Tracking: Crash reports are sent silently without user interaction.
+
+RepoType: git
+Repo: https://github.com/calculushk/wonderdroid.git
+
+Builds:
+  - versionName: 1.8b2
+    versionCode: 36
+    commit: b75f439e745
+    subdir: wonderdroid
+    srclibs:
+      - MobAdMob@2d5736
+    prebuild:
+      - echo "android.library.reference.1=$$MobAdMob$$" >> project.properties
+      - echo "android.library=true" >> $$MobAdMob$$/project.properties
+      - rm -f libs/GoogleAdMobAdsSdk-6.0.1.jar
+    buildjni:
+      - yes
+
+  - versionName: 1.8c
+    versionCode: 37
+    commit: 1a14c45ffdeb
+    subdir: wonderdroid
+    srclibs:
+      - MobAdMob@2d5736
+    prebuild:
+      - echo "android.library.reference.1=$$MobAdMob$$" >> project.properties
+      - echo "android.library=true" >> $$MobAdMob$$/project.properties
+      - rm -rf libs/GoogleAdMobAdsSdk-6.0.1.jar libs/*/
+    buildjni:
+      - yes
+
+  - versionName: '1.9'
+    versionCode: 39
+    commit: 5d92956205f5
+    subdir: wonderdroid
+    patch:
+      - jni.diff
+    srclibs:
+      - MobAdMob@3bd7888
+      - ActionBarSherlock@4.4.0
+    prebuild:
+      - echo "android.library.reference.1=$$MobAdMob$$" >> project.properties
+      - echo "android.library.reference.2=$$ActionBarSherlock$$" >> project.properties
+      - rm -rf libs/GoogleAdMobAdsSdk-6.0.1.jar
+    buildjni:
+      - yes
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: '1.9'
+CurrentVersionCode: 39
diff --git a/metadata/uk.org.crimetalk.txt b/metadata/uk.org.crimetalk.txt
deleted file mode 100644
index 177be746dd..0000000000
--- a/metadata/uk.org.crimetalk.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Categories:Reading,Science & Education
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/JohnPersano/CrimeTalk-Reader
-Issue Tracker:https://github.com/JohnPersano/CrimeTalk-Reader/issues
-
-Auto Name:CrimeTalk
-Summary:Read crimetalk.org.uk
-Description:
-[http://www.crimetalk.org.uk/ CrimeTalk] is a educational publishing venture
-concerned with crime, criminal justice, social deviance, morality, immorality
-and anti-social behavior. It aims to provide a service for university students
-and scholars in the relevant disciplines like criminology, law, history, etc.
-.
-
-Repo Type:git
-Repo:https://github.com/JohnPersano/CrimeTalk-Reader/
-
-Build:0.1,1
-    commit=87e56c7977c310282c002d5437c261481c7405d2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/com.afollestad:material-dialogs:0.3.1/com.afollestad:material-dialogs:0.3.2/g' build.gradle
-
-Build:0.3,3
-    commit=bc7e26b3749194bc6a2d815f711494f324ea250b
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:0.3
-Current Version Code:3
diff --git a/metadata/uk.org.crimetalk.yml b/metadata/uk.org.crimetalk.yml
new file mode 100644
index 0000000000..eedf4da3a5
--- /dev/null
+++ b/metadata/uk.org.crimetalk.yml
@@ -0,0 +1,39 @@
+Categories:
+  - Reading
+  - Science & Education
+License: Apache-2.0
+SourceCode: https://github.com/JohnPersano/CrimeTalk-Reader
+IssueTracker: https://github.com/JohnPersano/CrimeTalk-Reader/issues
+
+AutoName: CrimeTalk
+Summary: Read crimetalk.org.uk
+Description: |-
+    [http://www.crimetalk.org.uk/ CrimeTalk] is a educational publishing venture
+    concerned with crime, criminal justice, social deviance, morality, immorality
+    and anti-social behavior. It aims to provide a service for university students
+    and scholars in the relevant disciplines like criminology, law, history, etc.
+
+RepoType: git
+Repo: https://github.com/JohnPersano/CrimeTalk-Reader/
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 1
+    commit: 87e56c7977c310282c002d5437c261481c7405d2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/com.afollestad:material-dialogs:0.3.1/com.afollestad:material-dialogs:0.3.2/g'
+        build.gradle
+
+  - versionName: '0.3'
+    versionCode: 3
+    commit: bc7e26b3749194bc6a2d815f711494f324ea250b
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '0.3'
+CurrentVersionCode: 3
diff --git a/metadata/uk.org.ngo.squeezer.txt b/metadata/uk.org.ngo.squeezer.txt
deleted file mode 100644
index f418c33167..0000000000
--- a/metadata/uk.org.ngo.squeezer.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-AntiFeatures:UpstreamNonFree
-Categories:Multimedia
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/nikclayton/android-squeezer
-Issue Tracker:https://github.com/nikclayton/android-squeezer/issues
-Changelog:https://github.com/nikclayton/android-squeezer/blob/HEAD/NEWS
-
-Auto Name:Squeezer
-Summary:Squeezebox remote control
-Description:
-Control your SqueezeCenter ("Slimserver") and Squeezebox (or multiple
-squeezeboxes) from your Android gadget.
-
-* Now playing, artwork, seeking within tracks, volume control
-* Browse the library by artist, album, song title, genre, year, or playlist
-* Browse the music folders (if supported by the server)
-* Full library search
-* Internet radio support (browse, staff picks, search)
-* Scan the local network for compatible Squeezeservers
-
-The Google Analytics library was replaced with a dummy library, so no usage
-statistics will be sent even though there is a switch enabled in the
-Preferences.
-.
-
-Repo Type:git
-Repo:https://github.com/nikclayton/android-squeezer.git
-
-Build:0.9,12
-    commit=0.9
-    srclibs=NoAnalytics@158a4a
-    rm=libs/libGoogleAnalytics.jar
-    prebuild=echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties && \
-        rm -rf market
-
-Build:0.9.1,13
-    commit=0.9.1
-    srclibs=NoAnalytics@158a4a
-    rm=libs/libGoogleAnalytics.jar
-    prebuild=echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties && \
-        rm -rf market && \
-        sed -i '/proguard/d' project.properties
-
-Build:1.4.0,53
-    disable=see maintainer notes
-
-Build:1.4.1,56
-    disable=see maintainer notes
-
-Maintainer Notes:
-Includes both, Crashlytics and Google Analytics. Tags are un-
-reliable since UCM reads the beta tag, not the live (~= release)
-tag.
-.
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.4.1
-Current Version Code:56
diff --git a/metadata/uk.org.ngo.squeezer.yml b/metadata/uk.org.ngo.squeezer.yml
new file mode 100644
index 0000000000..b6eb320a76
--- /dev/null
+++ b/metadata/uk.org.ngo.squeezer.yml
@@ -0,0 +1,70 @@
+AntiFeatures:
+  - UpstreamNonFree
+Categories:
+  - Multimedia
+License: Apache-2.0
+SourceCode: https://github.com/nikclayton/android-squeezer
+IssueTracker: https://github.com/nikclayton/android-squeezer/issues
+Changelog: https://github.com/nikclayton/android-squeezer/blob/HEAD/NEWS
+
+AutoName: Squeezer
+Summary: Squeezebox remote control
+Description: |-
+    Control your SqueezeCenter ("Slimserver") and Squeezebox (or multiple
+    squeezeboxes) from your Android gadget.
+
+    * Now playing, artwork, seeking within tracks, volume control
+    * Browse the library by artist, album, song title, genre, year, or playlist
+    * Browse the music folders (if supported by the server)
+    * Full library search
+    * Internet radio support (browse, staff picks, search)
+    * Scan the local network for compatible Squeezeservers
+
+    The Google Analytics library was replaced with a dummy library, so no usage
+    statistics will be sent even though there is a switch enabled in the
+    Preferences.
+
+RepoType: git
+Repo: https://github.com/nikclayton/android-squeezer.git
+
+Builds:
+  - versionName: '0.9'
+    versionCode: 12
+    commit: '0.9'
+    srclibs:
+      - NoAnalytics@158a4a
+    rm:
+      - libs/libGoogleAnalytics.jar
+    prebuild:
+      - echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
+      - rm -rf market
+
+  - versionName: 0.9.1
+    versionCode: 13
+    commit: 0.9.1
+    srclibs:
+      - NoAnalytics@158a4a
+    rm:
+      - libs/libGoogleAnalytics.jar
+    prebuild:
+      - echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
+      - rm -rf market
+      - sed -i '/proguard/d' project.properties
+
+  - versionName: 1.4.0
+    versionCode: 53
+    disable: see maintainer notes
+
+  - versionName: 1.4.1
+    versionCode: 56
+    disable: see maintainer notes
+
+MaintainerNotes: |-
+    Includes both, Crashlytics and Google Analytics. Tags are un-
+    reliable since UCM reads the beta tag, not the live (~= release)
+    tag.
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: 1.4.1
+CurrentVersionCode: 56
diff --git a/metadata/unisiegen.photographers.activity.txt b/metadata/unisiegen.photographers.activity.txt
deleted file mode 100644
index f6efe82089..0000000000
--- a/metadata/unisiegen.photographers.activity.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-Categories:Multimedia,Graphics
-License:Apache-2.0
-Web Site:https://bitbucket.org/sdraxler/photographers-notebook
-Source Code:https://bitbucket.org/sdraxler/photographers-notebook/src
-Issue Tracker:https://bitbucket.org/sdraxler/photographers-notebook/issues
-Changelog:https://bitbucket.org/sdraxler/photographers-notebook/src/tip/Photographers/docs/changelog.txt
-
-Name:Photographer's Notebook
-Auto Name:Photographer's
-Summary:Manage metadata for analog photography
-Description:
-Photographer's Notebook is an app to store and manage metadata of analogue
-photos. It is meant to replace the usual paper-based notebooks photographers use
-to document camera settings in analogue photography.
-.
-
-Repo Type:hg
-Repo:https://bitbucket.org/sdraxler/photographers-notebook
-
-Build:Beta v4,4
-    commit=v4
-    subdir=Photographers
-
-Build:Beta v5,5
-    commit=v5
-    subdir=Photographers
-
-Build:Beta v5.1,6
-    commit=v5.1
-    subdir=Photographers
-
-Build:Beta v5.2,7
-    commit=v5.2
-    subdir=Photographers
-
-Build:Beta v6.1,8
-    commit=v6.1
-    subdir=Photographers
-
-Build:Beta v6.2,9
-    commit=v6.2
-    subdir=Photographers
-
-Build:Beta v6.4,11
-    commit=v6.4
-    subdir=Photographers
-
-Maintainer Notes:
-Check integrity of xstream jar again if it's updated.
-.
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:Beta v6.4
-Current Version Code:11
diff --git a/metadata/unisiegen.photographers.activity.yml b/metadata/unisiegen.photographers.activity.yml
new file mode 100644
index 0000000000..ecac43276d
--- /dev/null
+++ b/metadata/unisiegen.photographers.activity.yml
@@ -0,0 +1,62 @@
+Categories:
+  - Multimedia
+  - Graphics
+License: Apache-2.0
+WebSite: https://bitbucket.org/sdraxler/photographers-notebook
+SourceCode: https://bitbucket.org/sdraxler/photographers-notebook/src
+IssueTracker: https://bitbucket.org/sdraxler/photographers-notebook/issues
+Changelog: https://bitbucket.org/sdraxler/photographers-notebook/src/tip/Photographers/docs/changelog.txt
+
+Name: Photographer's Notebook
+AutoName: Photographer's
+Summary: Manage metadata for analog photography
+Description: |-
+    Photographer's Notebook is an app to store and manage metadata of analogue
+    photos. It is meant to replace the usual paper-based notebooks photographers use
+    to document camera settings in analogue photography.
+
+RepoType: hg
+Repo: https://bitbucket.org/sdraxler/photographers-notebook
+
+Builds:
+  - versionName: Beta v4
+    versionCode: 4
+    commit: v4
+    subdir: Photographers
+
+  - versionName: Beta v5
+    versionCode: 5
+    commit: v5
+    subdir: Photographers
+
+  - versionName: Beta v5.1
+    versionCode: 6
+    commit: v5.1
+    subdir: Photographers
+
+  - versionName: Beta v5.2
+    versionCode: 7
+    commit: v5.2
+    subdir: Photographers
+
+  - versionName: Beta v6.1
+    versionCode: 8
+    commit: v6.1
+    subdir: Photographers
+
+  - versionName: Beta v6.2
+    versionCode: 9
+    commit: v6.2
+    subdir: Photographers
+
+  - versionName: Beta v6.4
+    versionCode: 11
+    commit: v6.4
+    subdir: Photographers
+
+MaintainerNotes: Check integrity of xstream jar again if it's updated.
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: Beta v6.4
+CurrentVersionCode: 11
diff --git a/metadata/universe.constellation.orion.viewer.txt b/metadata/universe.constellation.orion.viewer.txt
deleted file mode 100644
index a10599b290..0000000000
--- a/metadata/universe.constellation.orion.viewer.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-Categories:Reading
-License:GPL-3.0-only
-Web Site:https://sourceforge.net/projects/orion-viewer
-Source Code:https://sourceforge.net/p/orion-viewer/code
-Issue Tracker:https://sourceforge.net/p/orion-viewer/tickets
-
-Auto Name:Orion Viewer
-Summary:Viewer for PDF, DJVU, XPS and CBZ files
-Description:
-Viewer based on various open-source projects that supports PDF, DJVU, XPS and
-CBZ files.
-
-Features:
-
-* outline, bookmarks
-* text selection
-* tap zones & key binding
-* portrait/landscape orientation
-* custom zooming
-* custom border cropping
-* support different traversal patterns inside page: left to right; right to left
-* built-in file manager with recently opened file view
-* external dictionaries support
-.
-
-Repo Type:git
-Repo:https://git.code.sf.net/p/orion-viewer/code
-
-Build:0.54.2,81
-    disable=needs work on jni
-    commit=71ad6b9df507adf4c66b9705ed4f9146e83109aa
-    subdir=orion-viewer
-    gradle=yes
-    buildjni=yes
-
-Maintainer Notes:
-* erratic/non-existent tags
-* jni issues
-* version codes:
-    New version code for [android] is 98
-    New version code for [arm5] is 98
-    New version code for [mips] is 101
-    New version code for [arm7] is 99
-    New version code for [x86] is 100
-    New version code for [x86] is 100
-.
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:0.54.2
-Current Version Code:81
diff --git a/metadata/uobikiemukot.yaft.txt b/metadata/uobikiemukot.yaft.txt
deleted file mode 100644
index adf31234cd..0000000000
--- a/metadata/uobikiemukot.yaft.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-Categories:Development
-License:MIT
-Web Site:
-Source Code:https://github.com/uobikiemukot/yaft-android
-Issue Tracker:https://github.com/uobikiemukot/yaft-android/issues
-
-Auto Name:yaft
-Summary:Simple terminal emulator
-Description:
-Simple terminal emulator for minimalists. It is based on yaft -- yet another
-framebuffer terminal.
-
-Features:
-
-* almost compatible with vt102 and linux console
-* UTF-8 support
-* 256 color support
-.
-
-Repo Type:git
-Repo:https://github.com/uobikiemukot/yaft-android
-
-Build:1.0,1
-    disable=blank screen
-    commit=9a403359507274ff431b05b4f4e128a18cbf1de7
-    target=android-17
-    build=make
-    buildjni=yes
-
-Build:1.0,2
-    disable=blank screen
-    commit=7383b96e1c20c76bd6aa7db8dba84a55bfb3e95f
-    target=android-17
-    buildjni=yes
-
-Build:1.0,4
-    commit=cb456e1b87118b261c70bb2354ca34849a2b8ee4
-    target=android-17
-    buildjni=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.0
-Current Version Code:4
diff --git a/metadata/uobikiemukot.yaft.yml b/metadata/uobikiemukot.yaft.yml
new file mode 100644
index 0000000000..b5709682d5
--- /dev/null
+++ b/metadata/uobikiemukot.yaft.yml
@@ -0,0 +1,50 @@
+Categories:
+  - Development
+License: MIT
+SourceCode: https://github.com/uobikiemukot/yaft-android
+IssueTracker: https://github.com/uobikiemukot/yaft-android/issues
+
+AutoName: yaft
+Summary: Simple terminal emulator
+Description: |-
+    Simple terminal emulator for minimalists. It is based on yaft -- yet another
+    framebuffer terminal.
+
+    Features:
+
+    * almost compatible with vt102 and linux console
+    * UTF-8 support
+    * 256 color support
+
+RepoType: git
+Repo: https://github.com/uobikiemukot/yaft-android
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    disable: blank screen
+    commit: 9a403359507274ff431b05b4f4e128a18cbf1de7
+    target: android-17
+    build: make
+    buildjni:
+      - yes
+
+  - versionName: '1.0'
+    versionCode: 2
+    disable: blank screen
+    commit: 7383b96e1c20c76bd6aa7db8dba84a55bfb3e95f
+    target: android-17
+    buildjni:
+      - yes
+
+  - versionName: '1.0'
+    versionCode: 4
+    commit: cb456e1b87118b261c70bb2354ca34849a2b8ee4
+    target: android-17
+    buildjni:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.0'
+CurrentVersionCode: 4
diff --git a/metadata/urbanstew.RehearsalAssistant.txt b/metadata/urbanstew.RehearsalAssistant.txt
deleted file mode 100644
index cc38d35033..0000000000
--- a/metadata/urbanstew.RehearsalAssistant.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Categories:Multimedia
-License:GPL-2.0-only
-Web Site:
-Source Code:https://sourceforge.net/p/rehearsalassist/code/HEAD/tree/
-Issue Tracker:https://sourceforge.net/p/rehearsalassist/_list/tickets
-Donate:https://sourceforge.net/p/rehearsalassist/donate
-
-Auto Name:Rehearsal Assistant
-Summary:A voice/sound recording tool
-Description:
-A voice / sound recording utility with two modes of operation:
-
-Session Mode: organizes recordings into sessions, and time-stamps relative to
-the beginning of the session, making it useful for recording your thoughts and
-observations during an event.
-
-If you are a choreographer or director watching a rehearsal of your work, this
-can help you make note of the feedback you want to share with the cast.
-
-Simple Mode: easy recording and playback of sound files. If you are a musician
-or writer, it can help you record and remember your spontaneous moments of
-inspiration.
-
-Also works great for shopping lists and other kinds of reminders.
-.
-
-Repo Type:git-svn
-Repo:https://svn.code.sf.net/p/rehearsalassist/code/
-
-Build:0.8.2,22
-    commit=90
-    prebuild=mkdir -p gen/urbanstew/RehearsalAssistant && \
-        aidl aidl/urbanstew/RehearsalAssistant/IRecordService.aidl gen/urbanstew/RehearsalAssistant/IRecordService.java
-    target=android-8
-
-Build:0.9,26
-    commit=100
-    target=android-8
-    build=mkdir -p gen/urbanstew/RehearsalAssistant && \
-        aidl aidl/urbanstew/RehearsalAssistant/IRecordService.aidl gen/urbanstew/RehearsalAssistant/IRecordService.java
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:0.9.1
-Current Version Code:27
diff --git a/metadata/urbanstew.RehearsalAssistant.yml b/metadata/urbanstew.RehearsalAssistant.yml
new file mode 100644
index 0000000000..4024cce0a9
--- /dev/null
+++ b/metadata/urbanstew.RehearsalAssistant.yml
@@ -0,0 +1,49 @@
+Categories:
+  - Multimedia
+License: GPL-2.0-only
+SourceCode: https://sourceforge.net/p/rehearsalassist/code/HEAD/tree/
+IssueTracker: https://sourceforge.net/p/rehearsalassist/_list/tickets
+Donate: https://sourceforge.net/p/rehearsalassist/donate
+
+AutoName: Rehearsal Assistant
+Summary: A voice/sound recording tool
+Description: |-
+    A voice / sound recording utility with two modes of operation:
+
+    Session Mode: organizes recordings into sessions, and time-stamps relative to
+    the beginning of the session, making it useful for recording your thoughts and
+    observations during an event.
+
+    If you are a choreographer or director watching a rehearsal of your work, this
+    can help you make note of the feedback you want to share with the cast.
+
+    Simple Mode: easy recording and playback of sound files. If you are a musician
+    or writer, it can help you record and remember your spontaneous moments of
+    inspiration.
+
+    Also works great for shopping lists and other kinds of reminders.
+
+RepoType: git-svn
+Repo: https://svn.code.sf.net/p/rehearsalassist/code/
+
+Builds:
+  - versionName: 0.8.2
+    versionCode: 22
+    commit: '90'
+    prebuild:
+      - mkdir -p gen/urbanstew/RehearsalAssistant
+      - aidl aidl/urbanstew/RehearsalAssistant/IRecordService.aidl gen/urbanstew/RehearsalAssistant/IRecordService.java
+    target: android-8
+
+  - versionName: '0.9'
+    versionCode: 26
+    commit: '100'
+    target: android-8
+    build:
+      - mkdir -p gen/urbanstew/RehearsalAssistant
+      - aidl aidl/urbanstew/RehearsalAssistant/IRecordService.aidl gen/urbanstew/RehearsalAssistant/IRecordService.java
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 0.9.1
+CurrentVersionCode: 27
diff --git a/metadata/us.achromaticmetaphor.agram.txt b/metadata/us.achromaticmetaphor.agram.txt
deleted file mode 100644
index d6f8bd0460..0000000000
--- a/metadata/us.achromaticmetaphor.agram.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Categories:Reading
-License:MIT
-Web Site:
-Source Code:https://github.com/achromaticmetaphor/agram
-Issue Tracker:https://github.com/achromaticmetaphor/agram/issues
-
-Auto Name:agram
-Summary:Anagram lister
-Description:
-Lists single-word and multi-word anagrams in English.
-.
-
-Repo Type:git
-Repo:https://github.com/achromaticmetaphor/agram
-
-Build:0.1,1
-    commit=v0.1
-    build=make -C jni
-    buildjni=yes
-
-Build:0.2,15
-    commit=v0.2
-    buildjni=yes
-
-Build:1.0,16
-    commit=v1.0
-    buildjni=yes
-
-Build:1.1,17
-    commit=v1.1
-    buildjni=yes
-
-Build:1.2,18
-    commit=v1.2
-    buildjni=yes
-
-Build:1.3,19
-    commit=v1.3
-    buildjni=yes
-
-Build:1.4,20
-    commit=v1.4
-    buildjni=yes
-
-Build:1.4.1,21
-    commit=v1.4.1
-    buildjni=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.4.1
-Current Version Code:21
diff --git a/metadata/us.achromaticmetaphor.agram.yml b/metadata/us.achromaticmetaphor.agram.yml
new file mode 100644
index 0000000000..fb8091d2c7
--- /dev/null
+++ b/metadata/us.achromaticmetaphor.agram.yml
@@ -0,0 +1,67 @@
+Categories:
+  - Reading
+License: MIT
+SourceCode: https://github.com/achromaticmetaphor/agram
+IssueTracker: https://github.com/achromaticmetaphor/agram/issues
+
+AutoName: agram
+Summary: Anagram lister
+Description: Lists single-word and multi-word anagrams in English.
+
+RepoType: git
+Repo: https://github.com/achromaticmetaphor/agram
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 1
+    commit: v0.1
+    build: make -C jni
+    buildjni:
+      - yes
+
+  - versionName: '0.2'
+    versionCode: 15
+    commit: v0.2
+    buildjni:
+      - yes
+
+  - versionName: '1.0'
+    versionCode: 16
+    commit: v1.0
+    buildjni:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 17
+    commit: v1.1
+    buildjni:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 18
+    commit: v1.2
+    buildjni:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 19
+    commit: v1.3
+    buildjni:
+      - yes
+
+  - versionName: '1.4'
+    versionCode: 20
+    commit: v1.4
+    buildjni:
+      - yes
+
+  - versionName: 1.4.1
+    versionCode: 21
+    commit: v1.4.1
+    buildjni:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.4.1
+CurrentVersionCode: 21
diff --git a/metadata/us.achromaticmetaphor.imcktg.txt b/metadata/us.achromaticmetaphor.imcktg.txt
deleted file mode 100644
index fd94738e21..0000000000
--- a/metadata/us.achromaticmetaphor.imcktg.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Categories:Phone & SMS,Multimedia
-License:MIT
-Web Site:
-Source Code:https://github.com/achromaticmetaphor/IMCKTG
-Issue Tracker:https://github.com/achromaticmetaphor/IMCKTG/issues
-
-Auto Name:IMCKTG
-Summary:Ringtone generator
-Description:
-Generates Morse code ringtones in WAVE and iMelody formats.
-.
-
-Repo Type:git
-Repo:https://github.com/achromaticmetaphor/IMCKTG
-
-Build:0.4,10
-    commit=v0.4
-
-Build:0.5,11
-    commit=v0.5
-
-Build:0.5.1,12
-    commit=v0.5.1
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.5.1
-Current Version Code:12
diff --git a/metadata/us.achromaticmetaphor.imcktg.yml b/metadata/us.achromaticmetaphor.imcktg.yml
new file mode 100644
index 0000000000..131d95583d
--- /dev/null
+++ b/metadata/us.achromaticmetaphor.imcktg.yml
@@ -0,0 +1,33 @@
+Categories:
+  - Phone & SMS
+  - Multimedia
+License: MIT
+SourceCode: https://github.com/achromaticmetaphor/IMCKTG
+IssueTracker: https://github.com/achromaticmetaphor/IMCKTG/issues
+
+AutoName: IMCKTG
+Summary: Ringtone generator
+Description: Generates Morse code ringtones in WAVE and iMelody formats.
+
+RepoType: git
+Repo: https://github.com/achromaticmetaphor/IMCKTG
+
+Builds:
+  - versionName: '0.4'
+    versionCode: 10
+    commit: v0.4
+
+  - versionName: '0.5'
+    versionCode: 11
+    commit: v0.5
+
+  - versionName: 0.5.1
+    versionCode: 12
+    commit: v0.5.1
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.5.1
+CurrentVersionCode: 12
diff --git a/metadata/us.bravender.android.dongsa.txt b/metadata/us.bravender.android.dongsa.txt
deleted file mode 100644
index c2954da70a..0000000000
--- a/metadata/us.bravender.android.dongsa.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Categories:Science & Education
-License:AGPL-3.0-only
-Web Site:http://dongsa.net
-Source Code:https://github.com/dbravender/korean_conjugation
-Issue Tracker:https://github.com/dbravender/korean_conjugation/issues
-
-Auto Name:Dongsa
-Summary:Korean verb conjugation tool
-Description:
-Shows Korean verb conjugations for learners of Korean.
-.
-
-Repo Type:git
-Repo:https://github.com/dbravender/korean_conjugation
-
-Build:2.0,6
-    commit=android-2.0
-    subdir=android
-    init=rm -f build.xml
-
-Build:2.2,8
-    commit=android-2.2
-    subdir=android
-    init=rm -f build.xml
-    target=android-8
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:2.2
-Current Version Code:8
diff --git a/metadata/us.bravender.android.dongsa.yml b/metadata/us.bravender.android.dongsa.yml
new file mode 100644
index 0000000000..c7806cc893
--- /dev/null
+++ b/metadata/us.bravender.android.dongsa.yml
@@ -0,0 +1,32 @@
+Categories:
+  - Science & Education
+License: AGPL-3.0-only
+WebSite: http://dongsa.net
+SourceCode: https://github.com/dbravender/korean_conjugation
+IssueTracker: https://github.com/dbravender/korean_conjugation/issues
+
+AutoName: Dongsa
+Summary: Korean verb conjugation tool
+Description: Shows Korean verb conjugations for learners of Korean.
+
+RepoType: git
+Repo: https://github.com/dbravender/korean_conjugation
+
+Builds:
+  - versionName: '2.0'
+    versionCode: 6
+    commit: android-2.0
+    subdir: android
+    init: rm -f build.xml
+
+  - versionName: '2.2'
+    versionCode: 8
+    commit: android-2.2
+    subdir: android
+    init: rm -f build.xml
+    target: android-8
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: '2.2'
+CurrentVersionCode: 8
diff --git a/metadata/us.feras.mdv.demo.txt b/metadata/us.feras.mdv.demo.txt
deleted file mode 100644
index 186cd1dee2..0000000000
--- a/metadata/us.feras.mdv.demo.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Categories:Reading
-License:Apache-2.0
-Web Site:https://falnatsheh.github.io/projects/markdownview
-Source Code:https://github.com/falnatsheh/MarkdownView
-Issue Tracker:https://github.com/falnatsheh/MarkdownView/issues
-Changelog:https://github.com/falnatsheh/MarkdownView#changelog
-
-Auto Name:MarkdownView Demo
-Summary:Render markdown text
-Description:
-Edit and render text in the markdown format.
-.
-
-Repo Type:git
-Repo:https://github.com/falnatsheh/MarkdownView/
-
-Build:1.0,1
-    commit=98b0db192bfb3bf4c0fe7520c2510e569783ba58
-    subdir=MarkdownViewDemo
-
-Build:1.1,2
-    commit=468187a262d45aac0eba2cd32d57ce8301c88c90
-    subdir=MarkdownView/app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.1
-Current Version Code:2
diff --git a/metadata/us.feras.mdv.demo.yml b/metadata/us.feras.mdv.demo.yml
new file mode 100644
index 0000000000..5eeff1c96d
--- /dev/null
+++ b/metadata/us.feras.mdv.demo.yml
@@ -0,0 +1,32 @@
+Categories:
+  - Reading
+License: Apache-2.0
+WebSite: https://falnatsheh.github.io/projects/markdownview
+SourceCode: https://github.com/falnatsheh/MarkdownView
+IssueTracker: https://github.com/falnatsheh/MarkdownView/issues
+Changelog: https://github.com/falnatsheh/MarkdownView#changelog
+
+AutoName: MarkdownView Demo
+Summary: Render markdown text
+Description: Edit and render text in the markdown format.
+
+RepoType: git
+Repo: https://github.com/falnatsheh/MarkdownView/
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 98b0db192bfb3bf4c0fe7520c2510e569783ba58
+    subdir: MarkdownViewDemo
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: 468187a262d45aac0eba2cd32d57ce8301c88c90
+    subdir: MarkdownView/app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.1'
+CurrentVersionCode: 2
diff --git a/metadata/us.koller.cameraroll.txt b/metadata/us.koller.cameraroll.txt
deleted file mode 100644
index 61f8705a32..0000000000
--- a/metadata/us.koller.cameraroll.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-Categories:Multimedia,Graphics
-License:Apache-2.0
-Author Name:Lukas Koller
-Web Site:http://lukas.koller.us/
-Source Code:https://github.com/kollerlukas/Camera-Roll-Android-App
-Issue Tracker:https://github.com/kollerlukas/Camera-Roll-Android-App/issues
-
-Summary:Camera Roll
-Description:
-Camera Roll is the perfect Gallery App to enjoy your photos, gifs and videos.
-
-==== Fast, Simple and intuitve ====
-
-Camera Roll features a simple and intuitve interface, that doesn't get in the
-way. This App is designed around speed and performance.
-
-==== Delightful Animations ====
-
-This Gallery App will delight you with its awsome and beautiful Animations.
-
-==== Exif Data ====
-
-With Camera Roll you can see and edit the Exif-Data of your pictures.
-
-==== Hidden Folder ====
-
-This Gallery App is able to show and help you clean up your hidden Folders.
-
-==== File Explorer ====
-
-Easily view the folders on your storage or SD Card. You are able to quickly
-copy, move and delete photos or directories.
-.
-
-Repo Type:git
-Repo:https://github.com/kollerlukas/Camera-Roll-Android-App
-
-Build:v1.0.3,33
-    commit=33-v1.0.3
-    subdir=app
-    gradle=yes
-
-Build:v1.0.4,34
-    commit=34-v1.0.4
-    subdir=app
-    gradle=yes
-
-Build:v1.0.5,35
-    commit=35-v1.0.5
-    subdir=app
-    gradle=yes
-
-Build:v1.0.6,36
-    commit=36-v1.0.6
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %c-%v
-Update Check Mode:Tags ^[0-9]+-v[0-9.]+$
-Current Version:v1.0.6
-Current Version Code:36
diff --git a/metadata/us.koller.cameraroll.yml b/metadata/us.koller.cameraroll.yml
new file mode 100644
index 0000000000..a85aeb6569
--- /dev/null
+++ b/metadata/us.koller.cameraroll.yml
@@ -0,0 +1,71 @@
+Categories:
+  - Multimedia
+  - Graphics
+License: Apache-2.0
+AuthorName: Lukas Koller
+WebSite: http://lukas.koller.us/
+SourceCode: https://github.com/kollerlukas/Camera-Roll-Android-App
+IssueTracker: https://github.com/kollerlukas/Camera-Roll-Android-App/issues
+
+Summary: Camera Roll
+Description: |-
+    Camera Roll is the perfect Gallery App to enjoy your photos, gifs and videos.
+
+    ==== Fast, Simple and intuitve ====
+
+    Camera Roll features a simple and intuitve interface, that doesn't get in the
+    way. This App is designed around speed and performance.
+
+    ==== Delightful Animations ====
+
+    This Gallery App will delight you with its awsome and beautiful Animations.
+
+    ==== Exif Data ====
+
+    With Camera Roll you can see and edit the Exif-Data of your pictures.
+
+    ==== Hidden Folder ====
+
+    This Gallery App is able to show and help you clean up your hidden Folders.
+
+    ==== File Explorer ====
+
+    Easily view the folders on your storage or SD Card. You are able to quickly
+    copy, move and delete photos or directories.
+
+RepoType: git
+Repo: https://github.com/kollerlukas/Camera-Roll-Android-App
+
+Builds:
+  - versionName: v1.0.3
+    versionCode: 33
+    commit: 33-v1.0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: v1.0.4
+    versionCode: 34
+    commit: 34-v1.0.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: v1.0.5
+    versionCode: 35
+    commit: 35-v1.0.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: v1.0.6
+    versionCode: 36
+    commit: 36-v1.0.6
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %c-%v
+UpdateCheckMode: Tags ^[0-9]+-v[0-9.]+$
+CurrentVersion: v1.0.6
+CurrentVersionCode: 36
diff --git a/metadata/us.lindanrandy.cidrcalculator.txt b/metadata/us.lindanrandy.cidrcalculator.txt
deleted file mode 100644
index 6a7ef93419..0000000000
--- a/metadata/us.lindanrandy.cidrcalculator.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Categories:Science & Education
-License:Apache-2.0
-Author Name:Randy McEoin
-Web Site:
-Source Code:https://github.com/rmceoin/cidrcalculator
-Issue Tracker:https://github.com/rmceoin/cidrcalculator/issues
-Changelog:https://github.com/rmceoin/cidrcalculator/blob/HEAD/cidrcalculator/CHANGELOG.txt
-
-Auto Name:CIDR Calculator
-Summary:Internet routing calculation
-Description:
-CIDR (Classless Inter-Domain Routing) Calculator is a simple IP subnet
-calculator for network engineers to quickly determine what the address range is
-of a subnet.
-.
-
-Repo Type:git
-Repo:https://github.com/rmceoin/cidrcalculator.git
-
-Build:1.13,115
-    commit=31
-    target=android-8
-
-Build:1.14,116
-    disable=No source available
-    commit=unknown - see disabled
-
-Build:1.16,118
-    commit=32
-    target=android-11
-
-Build:1.17,119
-    commit=34
-    target=android-15
-
-Build:1.20,125
-    commit=eee31e9955a80fd8360e630344c01b316c3e747f
-    subdir=cidrcalculator/app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'ExtraTranslation' } }" >> build.gradle
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.20
-Current Version Code:125
diff --git a/metadata/us.lindanrandy.cidrcalculator.yml b/metadata/us.lindanrandy.cidrcalculator.yml
new file mode 100644
index 0000000000..c936f53274
--- /dev/null
+++ b/metadata/us.lindanrandy.cidrcalculator.yml
@@ -0,0 +1,52 @@
+Categories:
+  - Science & Education
+License: Apache-2.0
+AuthorName: Randy McEoin
+SourceCode: https://github.com/rmceoin/cidrcalculator
+IssueTracker: https://github.com/rmceoin/cidrcalculator/issues
+Changelog: https://github.com/rmceoin/cidrcalculator/blob/HEAD/cidrcalculator/CHANGELOG.txt
+
+AutoName: CIDR Calculator
+Summary: Internet routing calculation
+Description: |-
+    CIDR (Classless Inter-Domain Routing) Calculator is a simple IP subnet
+    calculator for network engineers to quickly determine what the address range is
+    of a subnet.
+
+RepoType: git
+Repo: https://github.com/rmceoin/cidrcalculator.git
+
+Builds:
+  - versionName: '1.13'
+    versionCode: 115
+    commit: '31'
+    target: android-8
+
+  - versionName: '1.14'
+    versionCode: 116
+    disable: No source available
+    commit: unknown - see disabled
+
+  - versionName: '1.16'
+    versionCode: 118
+    commit: '32'
+    target: android-11
+
+  - versionName: '1.17'
+    versionCode: 119
+    commit: '34'
+    target: android-15
+
+  - versionName: '1.20'
+    versionCode: 125
+    commit: eee31e9955a80fd8360e630344c01b316c3e747f
+    subdir: cidrcalculator/app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'ExtraTranslation' } }" >>
+        build.gradle
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.20'
+CurrentVersionCode: 125
diff --git a/metadata/us.shandian.blacklight.txt b/metadata/us.shandian.blacklight.txt
deleted file mode 100644
index fb140897dd..0000000000
--- a/metadata/us.shandian.blacklight.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Disabled:Not buildable
-AntiFeatures:NonFreeNet
-Categories:Internet
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/PaperAirplane-Dev-Team/BlackLight
-Issue Tracker:https://github.com/PaperAirplane-Dev-Team/BlackLight/issues
-
-Auto Name:BlackLight
-Summary:Sina Weibo client
-Description:
-'''Noe:''' This app is no longer maintained.
-
-Client for Weibo, the popular chinese social network.
-.
-
-Repo Type:git
-Repo:https://github.com/PaperAirplane-Dev-Team/BlackLight
-
-Build:1.0.6.1,18
-    disable=jars,mismatches,r
-    commit=1.0.6.1
-    extlibs=android/android-support-v4.jar
-    target=android-19
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.0.6.1
-Current Version Code:18
diff --git a/metadata/us.shandian.giga.txt b/metadata/us.shandian.giga.txt
deleted file mode 100644
index 167aa7d77a..0000000000
--- a/metadata/us.shandian.giga.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Categories:Internet
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/PaperAirplane-Dev-Team/GigaGet
-Issue Tracker:https://github.com/PaperAirplane-Dev-Team/GigaGet/issues
-
-Auto Name:GigaGet
-Summary:Manage multiple downloads
-Description:
-Simple, multi-thread download manager.
-.
-
-Repo Type:git
-Repo:https://github.com/PaperAirplane-Dev-Team/GigaGet
-
-Build:1.1.3,7
-    commit=04f8715e5fb06e8f25e51bf6f69e3c4cfe8d79ec
-    subdir=app
-    gradle=yes
-
-Build:1.1.4,8
-    commit=v1.1.4
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.1.4
-Current Version Code:8
diff --git a/metadata/us.shandian.giga.yml b/metadata/us.shandian.giga.yml
new file mode 100644
index 0000000000..6f5c16eb03
--- /dev/null
+++ b/metadata/us.shandian.giga.yml
@@ -0,0 +1,32 @@
+Categories:
+  - Internet
+License: GPL-3.0-or-later
+SourceCode: https://github.com/PaperAirplane-Dev-Team/GigaGet
+IssueTracker: https://github.com/PaperAirplane-Dev-Team/GigaGet/issues
+
+AutoName: GigaGet
+Summary: Manage multiple downloads
+Description: Simple, multi-thread download manager.
+
+RepoType: git
+Repo: https://github.com/PaperAirplane-Dev-Team/GigaGet
+
+Builds:
+  - versionName: 1.1.3
+    versionCode: 7
+    commit: 04f8715e5fb06e8f25e51bf6f69e3c4cfe8d79ec
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.4
+    versionCode: 8
+    commit: v1.1.4
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.1.4
+CurrentVersionCode: 8
diff --git a/metadata/ut.ewh.audiometrytest.txt b/metadata/ut.ewh.audiometrytest.txt
deleted file mode 100644
index 9faa284b48..0000000000
--- a/metadata/ut.ewh.audiometrytest.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Categories:Sports & Health,Multimedia
-License:MIT
-Web Site:
-Source Code:https://github.com/ReeceStevens/ut_ewh_audiometer_2014
-Issue Tracker:https://github.com/ReeceStevens/ut_ewh_audiometer_2014/issues
-
-Auto Name:Audiometry Made Easy
-Summary:Test your hearing capabilities
-Description:
-'''Note:''' this app is no longer actively maintained.
-
-AME is designed to diagnose hearing loss without the need for expensive medical
-machines. Using signal analysis and your phone or tablet's own microphone, AME
-can calibrate virtually any pair of earphones for a hearing test that will
-return the user's hearing thresholds in dB HL. It also provides services for the
-user to save test results, view them later, and email test results anywhere from
-within the app.
-.
-
-Repo Type:git
-Repo:https://github.com/ReeceStevens/ut_ewh_audiometer_2014
-
-Build:1.65,14
-    commit=701ba85b602dd892574fe96468e37383c0a5692c
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.65
-Current Version Code:14
diff --git a/metadata/ut.ewh.audiometrytest.yml b/metadata/ut.ewh.audiometrytest.yml
new file mode 100644
index 0000000000..afa9544f17
--- /dev/null
+++ b/metadata/ut.ewh.audiometrytest.yml
@@ -0,0 +1,34 @@
+Categories:
+  - Sports & Health
+  - Multimedia
+License: MIT
+SourceCode: https://github.com/ReeceStevens/ut_ewh_audiometer_2014
+IssueTracker: https://github.com/ReeceStevens/ut_ewh_audiometer_2014/issues
+
+AutoName: Audiometry Made Easy
+Summary: Test your hearing capabilities
+Description: |-
+    '''Note:''' this app is no longer actively maintained.
+
+    AME is designed to diagnose hearing loss without the need for expensive medical
+    machines. Using signal analysis and your phone or tablet's own microphone, AME
+    can calibrate virtually any pair of earphones for a hearing test that will
+    return the user's hearing thresholds in dB HL. It also provides services for the
+    user to save test results, view them later, and email test results anywhere from
+    within the app.
+
+RepoType: git
+Repo: https://github.com/ReeceStevens/ut_ewh_audiometer_2014
+
+Builds:
+  - versionName: '1.65'
+    versionCode: 14
+    commit: 701ba85b602dd892574fe96468e37383c0a5692c
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.65'
+CurrentVersionCode: 14