diff --git a/alnux/build b/alnux/build
index ec3638a..6768afb 100755
--- a/alnux/build
+++ b/alnux/build
@@ -1,7 +1,7 @@
-mkdir "${PKG_PACKAGE_PATH}"/payload/dev
-mkdir "${PKG_PACKAGE_PATH}"/payload/mnt
-mkdir "${PKG_PACKAGE_PATH}"/payload/proc
-mkdir "${PKG_PACKAGE_PATH}"/payload/run
-mkdir "${PKG_PACKAGE_PATH}"/payload/sbin
-mkdir "${PKG_PACKAGE_PATH}"/payload/sys
-mkdir "${PKG_PACKAGE_PATH}"/payload/tmp
\ No newline at end of file
+mkdir $1/dev
+mkdir $1/mnt
+mkdir $1/proc
+mkdir $1/run
+mkdir $1/sbin
+mkdir $1/sys
+mkdir $1/tmp
\ No newline at end of file
diff --git a/alnux/package b/alnux/package
index 67b8a96..8286a61 100755
--- a/alnux/package
+++ b/alnux/package
@@ -1,5 +1,5 @@
-PKG_CONFIG_DEPLOY=true
-PKG_CONFIG_VER="0.2"
-PKG_CONFIG_NAME="alnux"
-PKG_CONFIG_MAKEDEPENDS=""
-PKG_CONFIG_DEPENDS=""
\ No newline at end of file
+pkg_config_deploy=true
+pkg_config_ver="0.2"
+pkg_config_name="alnux"
+pkg_config_makedepends=""
+pkg_config_depends=""
\ No newline at end of file
diff --git a/busybox-bin/package b/busybox-bin/package
deleted file mode 100755
index 9961407..0000000
--- a/busybox-bin/package
+++ /dev/null
@@ -1,5 +0,0 @@
-PKG_CONFIG_DEPLOY=true
-PKG_CONFIG_VER="0.2"
-PKG_CONFIG_NAME="busybox-bin"
-PKG_CONFIG_MAKEDEPENDS=""
-PKG_CONFIG_DEPENDS=""
\ No newline at end of file
diff --git a/busybox-bin/payload/bin/busybox b/busybox-bin/payload/bin/busybox
deleted file mode 100755
index 6206a94..0000000
Binary files a/busybox-bin/payload/bin/busybox and /dev/null differ
diff --git a/busybox-bin/postdeploy b/busybox-bin/postdeploy
deleted file mode 100755
index 5e0c974..0000000
--- a/busybox-bin/postdeploy
+++ /dev/null
@@ -1 +0,0 @@
-ln -s /bin/busybox "${INSTALL_ROOT}/bin/sh"
\ No newline at end of file
diff --git a/busybox-bin/payload/etc/group b/busybox/build
similarity index 100%
rename from busybox-bin/payload/etc/group
rename to busybox/build
diff --git a/busybox/package b/busybox/package
new file mode 100644
index 0000000..18b2b2e
--- /dev/null
+++ b/busybox/package
@@ -0,0 +1,5 @@
+pkg_config_deploy=true
+pkg_config_ver="0.2"
+pkg_config_name="busybox"
+pkg_config_makedepends=""
+pkg_config_depends=""
\ No newline at end of file
diff --git a/busybox-bin/payload/etc/mdev.conf b/busybox/payload/etc/group
similarity index 100%
rename from busybox-bin/payload/etc/mdev.conf
rename to busybox/payload/etc/group
diff --git a/busybox-bin/payload/etc/hostname b/busybox/payload/etc/hostname
similarity index 100%
rename from busybox-bin/payload/etc/hostname
rename to busybox/payload/etc/hostname
diff --git a/busybox-bin/payload/etc/hosts b/busybox/payload/etc/hosts
similarity index 100%
rename from busybox-bin/payload/etc/hosts
rename to busybox/payload/etc/hosts
diff --git a/busybox/payload/etc/mdev.conf b/busybox/payload/etc/mdev.conf
new file mode 100644
index 0000000..e69de29
diff --git a/busybox-bin/payload/etc/passwd b/busybox/payload/etc/passwd
similarity index 100%
rename from busybox-bin/payload/etc/passwd
rename to busybox/payload/etc/passwd
diff --git a/busybox-bin/payload/etc/resolv.conf b/busybox/payload/etc/resolv.conf
similarity index 100%
rename from busybox-bin/payload/etc/resolv.conf
rename to busybox/payload/etc/resolv.conf
diff --git a/busybox-bin/payload/usr/share/udhcpc/default.script b/busybox/payload/usr/share/udhcpc/default.script
old mode 100755
new mode 100644
similarity index 93%
rename from busybox-bin/payload/usr/share/udhcpc/default.script
rename to busybox/payload/usr/share/udhcpc/default.script
index 95f4f10..820e2fd
--- a/busybox-bin/payload/usr/share/udhcpc/default.script
+++ b/busybox/payload/usr/share/udhcpc/default.script
@@ -63,12 +63,12 @@ case "$1" in
 		echo "Recreating $realconf"
 		tmpfile="$realconf-$$"
 		#> "$tmpfile"
-		[ -n "$domain" ] # && echo "search $domain" >> "$tmpfile"
+		[ -n "$domain" ] && echo "search $domain" >> "$tmpfile"
 		for i in $dns ; do
 			echo " Adding DNS server $i"
-			#echo "nameserver $i" >> "$tmpfile"
+			echo "nameserver $i" >> "$tmpfile"
 		done
-		#/bin/busybox mv "$tmpfile" "$realconf"
+		/bin/busybox mv "$tmpfile" "$realconf"
 		;;
 esac
 
diff --git a/busybox/postdeploy b/busybox/postdeploy
new file mode 100644
index 0000000..0e7b6d5
--- /dev/null
+++ b/busybox/postdeploy
@@ -0,0 +1 @@
+/bin/busybox --install
\ No newline at end of file
diff --git a/glibc-bin/package b/glibc-bin/package
index fdf8eb2..de879a4 100755
--- a/glibc-bin/package
+++ b/glibc-bin/package
@@ -1,5 +1,5 @@
-PKG_CONFIG_DEPLOY=true
-PKG_CONFIG_VER="0.1"
-PKG_CONFIG_NAME="glibc-bin"
-PKG_CONFIG_MAKEDEPENDS=""
-PKG_CONFIG_DEPENDS=""
\ No newline at end of file
+pkg_config_deploy=true
+pkg_config_ver="0.1"
+pkg_config_name="glibc-bin"
+pkg_config_makedepends=""
+pkg_config_depends=""
\ No newline at end of file
diff --git a/grub-defconfig/package b/grub-defconfig/package
index 6bd2ff0..6dae383 100755
--- a/grub-defconfig/package
+++ b/grub-defconfig/package
@@ -1,5 +1,5 @@
-PKG_CONFIG_DEPLOY=true
-PKG_CONFIG_VER="0.2"
-PKG_CONFIG_NAME="grub-defconfig"
-PKG_CONFIG_MAKEDEPENDS=""
-PKG_CONFIG_DEPENDS=""
\ No newline at end of file
+pkg_config_deploy=true
+pkg_config_ver="0.2"
+pkg_config_name="grub-defconfig"
+pkg_config_makedepends=""
+pkg_config_depends=""
\ No newline at end of file
diff --git a/helloworld/package b/helloworld/package
index 612751a..20a6873 100755
--- a/helloworld/package
+++ b/helloworld/package
@@ -1,5 +1,5 @@
-PKG_CONFIG_DEPLOY=true
-PKG_CONFIG_VER="0.2"
-PKG_CONFIG_NAME="helloworld"
-PKG_CONFIG_MAKEDEPENDS=""
-PKG_CONFIG_DEPENDS=""
\ No newline at end of file
+pkg_config_deploy=true
+pkg_config_ver="0.2"
+pkg_config_name="helloworld"
+pkg_config_makedepends=""
+pkg_config_depends=""
\ No newline at end of file
diff --git a/hummingbird/build b/hummingbird/build
index 595827a..35ce150 100755
--- a/hummingbird/build
+++ b/hummingbird/build
@@ -1,5 +1,4 @@
-cd "${TEMP_LOCATION}"
 git clone https://github.com/Sweets/hummingbird hummingbird-build
 cd hummingbird-build
 make
-make install DESTDIR="${PKG_PACKAGE_PATH}/payload"
\ No newline at end of file
+make install DESTDIR=$1
\ No newline at end of file
diff --git a/hummingbird/package b/hummingbird/package
index 0d30833..4e2c75a 100755
--- a/hummingbird/package
+++ b/hummingbird/package
@@ -1 +1,5 @@
-ALPKG_DEPLOY=true
\ No newline at end of file
+pkg_config_deploy=true
+pkg_config_ver="0.1"
+pkg_config_name="hummingbird"
+pkg_config_makedepends=""
+pkg_config_depends=""
\ No newline at end of file
diff --git a/linux-bin/package b/linux-bin/package
index a077bcd..d565dba 100755
--- a/linux-bin/package
+++ b/linux-bin/package
@@ -1,5 +1,5 @@
-PKG_CONFIG_DEPLOY=true
-PKG_CONFIG_VER="0.1"
-PKG_CONFIG_NAME="linux-bin"
-PKG_CONFIG_MAKEDEPENDS=""
-PKG_CONFIG_DEPENDS=""
\ No newline at end of file
+pkg_config_deploy=true
+pkg_config_ver="0.1"
+pkg_config_name="linux-bin"
+pkg_config_makedepends=""
+pkg_config_depends=""
\ No newline at end of file