diff --git a/build-package b/build-package
index 68db638..07a0434 100755
--- a/build-package
+++ b/build-package
@@ -4,9 +4,7 @@ VERSION=21.0.90.20190703
 CWD=$(readlink -m "${BASH_SOURCE[0]}")
 CWD=$(dirname "${CWD}")
 
-for funcfile in  pkg-full pkg-microg pkg-fdroid \
-	pkg-misc update common download database \
-	pkg-bromite pkg-osmand; do
+for funcfile in  pkg update common download database; do
 	source "${CWD}/data/build-package.${funcfile}" || exit 1
 done
 
diff --git a/data/build-package.pkg b/data/build-package.pkg
new file mode 100644
index 0000000..bdd3afe
--- /dev/null
+++ b/data/build-package.pkg
@@ -0,0 +1,142 @@
+#!/bin/bash
+
+create_full_package () {
+	ZIP="NanoDroid-${VERSION}.zip"
+
+	print_package "Full"
+
+	zip_add Full
+	zip_add_config .nanodroid-setup 1
+
+	sum_sign_package
+}
+
+mk_pkg_full () {
+	create_full_package &
+	progress $!
+}
+
+create_microg_package() {
+	ZIP="NanoDroid-microG-${VERSION}.zip"
+
+	print_package "microG"
+
+
+	zip_add microG
+	zip_add_config .nanodroid-setup 0
+
+	sum_sign_package
+}
+
+mk_pkg_microg () {
+	create_microg_package &
+	progress $!
+}
+
+create_fdroid_package() {
+	ZIP="NanoDroid-fdroid-${VERSION}".zip
+
+	print_package "F-Droid"
+
+	zip_add F-Droid
+	zip_add_config .nanodroid-setup 0
+
+	sum_sign_package
+}
+
+mk_pkg_fdroid () {
+	create_fdroid_package &
+	progress $!
+}
+
+create_bromite_webview_package () {
+	ZIP="NanoDroid-BromiteWebView-${VERSION}.zip"
+
+	print_package BromiteWebView
+
+	zip_add BromiteWebView
+	zip_add_config .nanodroid-setup 0
+
+	sum_sign_package
+}
+
+mk_pkg_bromite_webview () {
+	create_bromite_webview_package &
+	progress $!
+}
+
+create_osmand_package() {
+	ZIP="NanoDroid-OsmAnd-${VERSION}.zip"
+
+	print_package "OsmAnd"
+
+	zip_add OsmAnd
+	zip_add_config .nanodroid-setup 0
+
+	sum_sign_package
+}
+
+mk_pkg_osmand () {
+	create_osmand_package &
+	progress $!
+}
+
+create_patcher_package() {
+	ZIP="NanoDroid-patcher-${VERSION}.zip"
+
+	print_package "Framework Patcher"
+
+	zip_add patcher
+
+	sum_sign_package
+}
+
+mk_pkg_patcher () {
+	create_patcher_package &
+	progress $!
+}
+
+create_setupwizard_package() {
+	ZIP="NanoDroid-setupwizard-${VERSION}.zip"
+
+	print_package "Setup Wizard"
+
+	zip_add setup-wizard
+
+	sum_sign_package
+}
+
+mk_pkg_setupwizard () {
+	create_setupwizard_package &
+	progress $!
+}
+
+create_uninstaller_package() {
+	ZIP="NanoDroid-uninstaller-${VERSION}.zip"
+
+	print_package "Uninstaller"
+
+	zip_add uninstaller
+
+	sum_sign_package
+}
+
+mk_pkg_uninstaller () {
+	create_uninstaller_package &
+	progress $!
+}
+
+create_systest_package() {
+	ZIP="NanoDroid-systest-${VERSION}.zip"
+
+	print_package "SysTest"
+
+	zip_add systest
+
+	sum_sign_package
+}
+
+mk_pkg_systest () {
+	create_systest_package &
+	progress $!
+}
diff --git a/data/build-package.pkg-bromite b/data/build-package.pkg-bromite
deleted file mode 100644
index 4c6e152..0000000
--- a/data/build-package.pkg-bromite
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-create_bromite_webview_package () {
-	ZIP="NanoDroid-BromiteWebView-${VERSION}.zip"
-
-	print_package BromiteWebView
-
-	zip_add BromiteWebView
-	zip_add_config .nanodroid-setup 0
-
-	sum_sign_package
-}
-
-mk_pkg_bromite_webview () {
-	create_bromite_webview_package &
-	progress $!
-}
diff --git a/data/build-package.pkg-fdroid b/data/build-package.pkg-fdroid
deleted file mode 100644
index e73f98d..0000000
--- a/data/build-package.pkg-fdroid
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-create_fdroid_package() {
-	ZIP="NanoDroid-fdroid-${VERSION}".zip
-
-	print_package "F-Droid"
-
-	zip_add F-Droid
-	zip_add_config .nanodroid-setup 0
-
-	sum_sign_package
-}
-
-mk_pkg_fdroid () {
-	create_fdroid_package &
-	progress $!
-}
diff --git a/data/build-package.pkg-full b/data/build-package.pkg-full
deleted file mode 100644
index a949939..0000000
--- a/data/build-package.pkg-full
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-create_full_package () {
-	ZIP="NanoDroid-${VERSION}.zip"
-
-	print_package "Full"
-
-	zip_add Full
-	zip_add_config .nanodroid-setup 1
-
-	sum_sign_package
-}
-
-mk_pkg_full () {
-	create_full_package &
-	progress $!
-}
diff --git a/data/build-package.pkg-microg b/data/build-package.pkg-microg
deleted file mode 100644
index 7e30777..0000000
--- a/data/build-package.pkg-microg
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-create_microg_package() {
-	ZIP="NanoDroid-microG-${VERSION}.zip"
-
-	print_package "microG"
-
-
-	zip_add microG
-	zip_add_config .nanodroid-setup 0
-
-	sum_sign_package
-}
-
-mk_pkg_microg () {
-	create_microg_package &
-	progress $!
-}
diff --git a/data/build-package.pkg-misc b/data/build-package.pkg-misc
deleted file mode 100644
index f047c6b..0000000
--- a/data/build-package.pkg-misc
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-create_patcher_package() {
-	ZIP="NanoDroid-patcher-${VERSION}.zip"
-
-	print_package "Framework Patcher"
-
-	zip_add patcher
-
-	sum_sign_package
-}
-
-mk_pkg_patcher () {
-	create_patcher_package &
-	progress $!
-}
-
-create_setupwizard_package() {
-	ZIP="NanoDroid-setupwizard-${VERSION}.zip"
-
-	print_package "Setup Wizard"
-
-	zip_add setup-wizard
-
-	sum_sign_package
-}
-
-mk_pkg_setupwizard () {
-	create_setupwizard_package &
-	progress $!
-}
-
-create_uninstaller_package() {
-	ZIP="NanoDroid-uninstaller-${VERSION}.zip"
-
-	print_package "Uninstaller"
-
-	zip_add uninstaller
-
-	sum_sign_package
-}
-
-mk_pkg_uninstaller () {
-	create_uninstaller_package &
-	progress $!
-}
-
-create_systest_package() {
-	ZIP="NanoDroid-systest-${VERSION}.zip"
-
-	print_package "SysTest"
-
-	zip_add systest
-
-	sum_sign_package
-}
-
-mk_pkg_systest () {
-	create_systest_package &
-	progress $!
-}
diff --git a/data/build-package.pkg-osmand b/data/build-package.pkg-osmand
deleted file mode 100644
index 8ab9ad9..0000000
--- a/data/build-package.pkg-osmand
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-create_osmand_package() {
-	ZIP="NanoDroid-OsmAnd-${VERSION}.zip"
-
-	print_package "OsmAnd"
-
-	zip_add OsmAnd
-	zip_add_config .nanodroid-setup 0
-
-	sum_sign_package
-}
-
-mk_pkg_osmand () {
-	create_osmand_package &
-	progress $!
-}