diff --git a/data/build-package.common b/data/build-package.common
index 787ab15..51cfb72 100644
--- a/data/build-package.common
+++ b/data/build-package.common
@@ -114,6 +114,15 @@ zip_add_base () {
 	done
 }
 
+zip_add_doc () {
+	ZIP_PATH="${CWD}/${ZIP}"
+
+	cd "${CWD}"
+
+	zip -q "${ZIP_PATH}" README.md || exit 1
+	zip -q "${ZIP_PATH}" ChangeLog.md || exit 1
+}
+
 zip_add_tool () {
 	cd "${CWD}/tools"
 
@@ -214,9 +223,11 @@ print_package () {
 Creating Package
 
 	Type		${1}
-	Name		$(basename ${ZIP})
+	Name		${ZIP}
 	Directory	${CWD}
 "
+
+	rm -f "${CWD}/${ZIP}"*
 }
 
 error () {
diff --git a/data/build-package.pkg-bromite b/data/build-package.pkg-bromite
index c92220a..8955ba9 100644
--- a/data/build-package.pkg-bromite
+++ b/data/build-package.pkg-bromite
@@ -1,28 +1,17 @@
 #!/bin/bash
 
 create_bromite_webview_package () {
-	ZIP="${CWD}/NanoDroid-BromiteWebView-${VERSION}".zip
-	rm -f "${ZIP}"*
+	ZIP="NanoDroid-BromiteWebView-${VERSION}.zip"
 
-	print_package "BromiteWebView"
+	print_package BromiteWebView
 
-	cd "${CWD}/BromiteWebView"
-	zip_add
-	cd "${CWD}/Full"
-	zip_add "system/xbin/unzip*"
-	cd "${CWD}"
-
-	zip_add CommonInstaller
-	zip_add CommonAddon
-
-	cd "${CWD}/tools"
-	zip_add "busybox*"
-	cd "${CWD}"
-
-	zip_add_doc
+	zip_add_base
+	zip_add BromiteWebView
+	zip_add_tool busybox
+	zip_add_tool unzip
 	zip_add_config .nanodroid-setup 0
 
-	sum_sign_package "$(basename ${ZIP})"
+	sum_sign_package
 }
 
 mk_pkg_bromite_webview () {
diff --git a/data/build-package.pkg-fdroid b/data/build-package.pkg-fdroid
index fcc89be..bb6bb22 100644
--- a/data/build-package.pkg-fdroid
+++ b/data/build-package.pkg-fdroid
@@ -1,34 +1,20 @@
 #!/bin/bash
 
 create_fdroid_package() {
-	ZIP="${CWD}/NanoDroid-fdroid-${VERSION}".zip
-	rm -f "${ZIP}"*
+	ZIP="NanoDroid-fdroid-${VERSION}".zip
 
 	print_package "F-Droid"
 
-	cd "${CWD}/Full"
-	zip_add "system/app/FDroid/"
-	zip_add "system/priv-app/FDroidPrivileged/"
-	zip_add "system/etc/org.fdroid.fdroid/"
-	zip_add "system/xbin/unzip*"
-	cd "${CWD}"
-
-	cd "${CWD}/F-Droid"
-	zip_add
-	cd "${CWD}"
-
-	zip_add CommonInstaller
-	zip_add CommonAddon
-
-	cd "${CWD}/tools"
-	zip_add "busybox*"
-	zip_add "aapt*"
-	cd "${CWD}"
-
-	zip_add_doc
+	zip_add_base
+	zip_add F-Droid
+	zip_add Full system/app/FDroid/
+	zip_add Full system/etc/org.fdroid.fdroid/
+	zip_add Full system/priv-app/FDroidPrivileged/
+	zip_add_tool aapt
+	zip_add_tool busybox
 	zip_add_config .nanodroid-setup 0
 
-	sum_sign_package "$(basename ${ZIP})"
+	sum_sign_package
 }
 
 mk_pkg_fdroid () {
diff --git a/data/build-package.pkg-full b/data/build-package.pkg-full
index a8a3f84..678091d 100644
--- a/data/build-package.pkg-full
+++ b/data/build-package.pkg-full
@@ -1,28 +1,19 @@
 #!/bin/bash
 
 create_full_package () {
-	ZIP="${CWD}/NanoDroid-${VERSION}".zip
-	rm -f "${ZIP}"*
+	ZIP="NanoDroid-${VERSION}.zip"
 
 	print_package "Full"
 
-	cd "${CWD}/Full"
-	zip_add
-	cd "${CWD}"
+	zip_add_base
+	zip_add Full
+	zip_add tools
 
-	zip_add CommonInstaller
-	zip_add CommonAddon
-
-	cd "${CWD}/tools"
-	zip_add "*"
-	cd "${CWD}"
-
-	zip_add_doc
 	zip_add_config .nanodroid-overlay
-	zip_add_config .nanodroid-setup 0
+	zip_add_config .nanodroid-setup 1
 	zip_add_config .nanodroid-apps
 
-	sum_sign_package "$(basename ${ZIP})"
+	sum_sign_package
 }
 
 mk_pkg_full () {
diff --git a/data/build-package.pkg-microg b/data/build-package.pkg-microg
index 3c1147b..25e22f8 100644
--- a/data/build-package.pkg-microg
+++ b/data/build-package.pkg-microg
@@ -1,47 +1,37 @@
 #!/bin/bash
 
 create_microg_package() {
-	ZIP="${CWD}/NanoDroid-microG-${VERSION}".zip
-	rm -f "${ZIP}"*
+	ZIP="NanoDroid-microG-${VERSION}.zip"
 
 	print_package "microG"
 
-	cd "${CWD}/Full"
+	zip_add_base
 
 	for app in AuroraStore DroidGuard nlpBackendApple nlpBackendDejavu \
 		nlpBackendIchnaea nlpBackendNominatim nlpBackendRadiocell; do
-		zip_add "system/app/${app}/"
+		zip_add Full system/app/${app}/
 	done
 
 	for app in FakeStore GmsCore_Official GmsCore_NanoDroid \
 		Phonesky GsfProxy YalpStore; do
-		zip_add "system/priv-app/${app}/"
+		zip_add Full system/priv-app/${app}/
 	done
 
-	for input in "system/xbin/nanodroid*" "system/xbin/novl" \
+	for content in "system/xbin/nanodroid*" "system/xbin/novl" \
 		"system/xbin/npem" "system/xbin/nprp" \
 		"system/xbin/nutl" "system/xbin/unzip*" "system/framework/" \
 		"gsync/" "system/etc/sysconfig/" "swipe/" \
 		"system/etc/default-permissions/" "system/etc/permissions/"; do
-		zip_add "${input}"
+		zip_add Full "${content}"
 	done
 
-	cd "${CWD}/microG"
-	zip_add
-	cd "${CWD}"
+	zip_add microG
+	zip_add tools
 
-	zip_add CommonInstaller
-	zip_add CommonAddon
-
-	cd "${CWD}/tools"
-	zip_add "*"
-	cd "${CWD}"
-
-	zip_add_doc
 	zip_add_config .nanodroid-overlay
-	zip_add_config .nanodroid-setup 1
+	zip_add_config .nanodroid-setup 0
 
-	sum_sign_package "$(basename ${ZIP})"
+	sum_sign_package
 }
 
 mk_pkg_microg () {
diff --git a/data/build-package.pkg-misc b/data/build-package.pkg-misc
index dc72032..3539dbd 100644
--- a/data/build-package.pkg-misc
+++ b/data/build-package.pkg-misc
@@ -1,21 +1,15 @@
 #!/bin/bash
 
 create_patcher_package() {
-	ZIP="${CWD}/NanoDroid-patcher-${VERSION}".zip
-	rm -f "${ZIP}"*
+	ZIP="NanoDroid-patcher-${VERSION}.zip"
 
 	print_package "Framework Patcher"
 
-	cd "${CWD}/patcher"
-	zip_add
-
-	cd "${CWD}/tools"
-	zip_add "busybox*"
-	cd "${CWD}"
-
+	zip_add patcher
 	zip_add_doc
+	zip_add_tool busybox
 
-	sum_sign_package "$(basename ${ZIP})"
+	sum_sign_package
 }
 
 mk_pkg_patcher () {
@@ -25,18 +19,14 @@ mk_pkg_patcher () {
 
 
 create_setupwizard_package() {
-	ZIP="${CWD}/NanoDroid-setupwizard-${VERSION}".zip
-	rm -f "${ZIP}"*
+	ZIP="NanoDroid-setupwizard-${VERSION}.zip"
 
 	print_package "Setup Wizard"
 
-	cd "${CWD}/setup-wizard"
-	zip_add
-	cd "${CWD}"
-
+	zip_add setup-wizard
 	zip_add_doc
 
-	sum_sign_package "$(basename ${ZIP})"
+	sum_sign_package
 }
 
 mk_pkg_setupwizard () {
@@ -45,22 +35,15 @@ mk_pkg_setupwizard () {
 }
 
 create_uninstaller_package() {
-	ZIP="${CWD}/NanoDroid-uninstaller-${VERSION}".zip
-	rm -f "${ZIP}"*
+	ZIP="NanoDroid-uninstaller-${VERSION}.zip"
 
 	print_package "Uninstaller"
 
-	cd "${CWD}/uninstaller"
-	zip_add
-	cd "${CWD}"
-
-	cd "${CWD}/tools"
-	zip_add "busybox*"
-	cd "${CWD}"
-
+	zip_add uninstaller
 	zip_add_doc
+	zip_add_tool busybox
 
-	sum_sign_package "$(basename ${ZIP})"
+	sum_sign_package
 }
 
 mk_pkg_uninstaller () {
@@ -69,22 +52,15 @@ mk_pkg_uninstaller () {
 }
 
 create_systest_package() {
-	ZIP="${CWD}/NanoDroid-systest-${VERSION}".zip
-	rm -f "${ZIP}"*
+	ZIP="NanoDroid-systest-${VERSION}.zip"
 
 	print_package "SysTest"
 
-	cd "${CWD}/systest"
-	zip_add
-	cd "${CWD}"
-
-	cd "${CWD}/tools"
-	zip_add "busybox*"
-	cd "${CWD}"
-
+	zip_add systest
 	zip_add_doc
+	zip_add_tool busybox
 
-	sum_sign_package "$(basename ${ZIP})"
+	sum_sign_package
 }
 
 mk_pkg_systest () {
diff --git a/data/build-package.pkg-osmand b/data/build-package.pkg-osmand
index 40f80d5..198c4ca 100644
--- a/data/build-package.pkg-osmand
+++ b/data/build-package.pkg-osmand
@@ -1,30 +1,16 @@
 #!/bin/bash
 
 create_osmand_package() {
-	ZIP="${CWD}/NanoDroid-OsmAnd-${VERSION}".zip
-	rm -f "${ZIP}"*
+	ZIP="NanoDroid-OsmAnd-${VERSION}.zip"
 
 	print_package "OsmAnd"
 
-	cd "${CWD}/Full"
-	zip_add "system/xbin/unzip*"
-	cd "${CWD}"
-
-	cd "${CWD}/OsmAnd"
-	zip_add
-	cd "${CWD}"
-
-	zip_add CommonInstaller
-	zip_add CommonAddon
-
-	cd "${CWD}/tools"
-	zip_add "busybox*"
-	cd "${CWD}"
-
-	zip_add_doc
+	zip_add_base
+	zip_add OsmAnd
+	zip_add_tool busybox
 	zip_add_config .nanodroid-setup 0
 
-	sum_sign_package "$(basename ${ZIP})"
+	sum_sign_package
 }
 
 mk_pkg_osmand () {