diff --git a/Makefile b/Makefile
index afcc854d6..3c20ced2d 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,6 @@ world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
 .PHONY: all world clean dirclean distclean source $(TARGETS) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE)
 
-include make/*.mk
 include toolchain/*/*.mk
 include package/*/*.mk
 
diff --git a/make/autoconf.mk b/package/autoconf/autoconf.mk
similarity index 100%
rename from make/autoconf.mk
rename to package/autoconf/autoconf.mk
diff --git a/make/automake.mk b/package/automake/automake.mk
similarity index 100%
rename from make/automake.mk
rename to package/automake/automake.mk
diff --git a/make/bash.mk b/package/bash/bash.mk
similarity index 100%
rename from make/bash.mk
rename to package/bash/bash.mk
diff --git a/make/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
similarity index 100%
rename from make/berkeleydb.mk
rename to package/berkeleydb/berkeleydb.mk
diff --git a/make/bison.mk b/package/bison/bison.mk
similarity index 100%
rename from make/bison.mk
rename to package/bison/bison.mk
diff --git a/make/boa.mk b/package/boa/boa.mk
similarity index 100%
rename from make/boa.mk
rename to package/boa/boa.mk
diff --git a/make/bridge.mk b/package/bridge/bridge.mk
similarity index 100%
rename from make/bridge.mk
rename to package/bridge/bridge.mk
diff --git a/make/bzip2.mk b/package/bzip2/bzip2.mk
similarity index 100%
rename from make/bzip2.mk
rename to package/bzip2/bzip2.mk
diff --git a/make/coreutils.mk b/package/coreutils/coreutils.mk
similarity index 100%
rename from make/coreutils.mk
rename to package/coreutils/coreutils.mk
diff --git a/make/cramfsroot.mk b/package/cramfsroot/cramfsroot.mk
similarity index 100%
rename from make/cramfsroot.mk
rename to package/cramfsroot/cramfsroot.mk
diff --git a/make/customize.mk b/package/customize/customize.mk
similarity index 100%
rename from make/customize.mk
rename to package/customize/customize.mk
diff --git a/make/dhcp_relay.mk b/package/dhcp_relay/dhcp_relay.mk
similarity index 100%
rename from make/dhcp_relay.mk
rename to package/dhcp_relay/dhcp_relay.mk
diff --git a/make/diffutils.mk b/package/diffutils/diffutils.mk
similarity index 100%
rename from make/diffutils.mk
rename to package/diffutils/diffutils.mk
diff --git a/make/distcc.mk b/package/distcc/distcc.mk
similarity index 100%
rename from make/distcc.mk
rename to package/distcc/distcc.mk
diff --git a/make/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
similarity index 100%
rename from make/dnsmasq.mk
rename to package/dnsmasq/dnsmasq.mk
diff --git a/make/dropbear_sshd.mk b/package/dropbear_sshd/dropbear_sshd.mk
similarity index 100%
rename from make/dropbear_sshd.mk
rename to package/dropbear_sshd/dropbear_sshd.mk
diff --git a/make/ed.mk b/package/ed/ed.mk
similarity index 100%
rename from make/ed.mk
rename to package/ed/ed.mk
diff --git a/make/ext2root.mk b/package/ext2root/ext2root.mk
similarity index 100%
rename from make/ext2root.mk
rename to package/ext2root/ext2root.mk
diff --git a/make/fakeroot.mk b/package/fakeroot/fakeroot.mk
similarity index 100%
rename from make/fakeroot.mk
rename to package/fakeroot/fakeroot.mk
diff --git a/make/file.mk b/package/file/file.mk
similarity index 100%
rename from make/file.mk
rename to package/file/file.mk
diff --git a/make/findutils.mk b/package/findutils/findutils.mk
similarity index 100%
rename from make/findutils.mk
rename to package/findutils/findutils.mk
diff --git a/make/flex.mk b/package/flex/flex.mk
similarity index 100%
rename from make/flex.mk
rename to package/flex/flex.mk
diff --git a/make/gawk.mk b/package/gawk/gawk.mk
similarity index 100%
rename from make/gawk.mk
rename to package/gawk/gawk.mk
diff --git a/make/gettext.mk b/package/gettext/gettext.mk
similarity index 100%
rename from make/gettext.mk
rename to package/gettext/gettext.mk
diff --git a/make/grep.mk b/package/grep/grep.mk
similarity index 100%
rename from make/grep.mk
rename to package/grep/grep.mk
diff --git a/make/gzip.mk b/package/gzip/gzip.mk
similarity index 100%
rename from make/gzip.mk
rename to package/gzip/gzip.mk
diff --git a/make/hostap.mk b/package/hostap/hostap.mk
similarity index 100%
rename from make/hostap.mk
rename to package/hostap/hostap.mk
diff --git a/make/hotplug.mk b/package/hotplug/hotplug.mk
similarity index 100%
rename from make/hotplug.mk
rename to package/hotplug/hotplug.mk
diff --git a/make/iproute2.mk b/package/iproute2/iproute2.mk
similarity index 100%
rename from make/iproute2.mk
rename to package/iproute2/iproute2.mk
diff --git a/make/iptables.mk b/package/iptables/iptables.mk
similarity index 100%
rename from make/iptables.mk
rename to package/iptables/iptables.mk
diff --git a/make/jffs2root.mk b/package/jffs2root/jffs2root.mk
similarity index 100%
rename from make/jffs2root.mk
rename to package/jffs2root/jffs2root.mk
diff --git a/make/jpeg.mk b/package/jpeg/jpeg.mk
similarity index 100%
rename from make/jpeg.mk
rename to package/jpeg/jpeg.mk
diff --git a/make/less.mk b/package/less/less.mk
similarity index 100%
rename from make/less.mk
rename to package/less/less.mk
diff --git a/make/libfloat.mk b/package/libfloat/libfloat.mk
similarity index 100%
rename from make/libfloat.mk
rename to package/libfloat/libfloat.mk
diff --git a/make/libglib12.mk b/package/libglib12/libglib12.mk
similarity index 100%
rename from make/libglib12.mk
rename to package/libglib12/libglib12.mk
diff --git a/make/libmad.mk b/package/libmad/libmad.mk
similarity index 100%
rename from make/libmad.mk
rename to package/libmad/libmad.mk
diff --git a/make/libtool.mk b/package/libtool/libtool.mk
similarity index 100%
rename from make/libtool.mk
rename to package/libtool/libtool.mk
diff --git a/make/links.mk b/package/links/links.mk
similarity index 100%
rename from make/links.mk
rename to package/links/links.mk
diff --git a/make/linux.mk b/package/linux/linux.mk
similarity index 100%
rename from make/linux.mk
rename to package/linux/linux.mk
diff --git a/make/lrzsz.mk b/package/lrzsz/lrzsz.mk
similarity index 100%
rename from make/lrzsz.mk
rename to package/lrzsz/lrzsz.mk
diff --git a/make/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
similarity index 100%
rename from make/ltp-testsuite.mk
rename to package/ltp-testsuite/ltp-testsuite.mk
diff --git a/make/ltrace.mk b/package/ltrace/ltrace.mk
similarity index 100%
rename from make/ltrace.mk
rename to package/ltrace/ltrace.mk
diff --git a/make/lzo.mk b/package/lzo/lzo.mk
similarity index 100%
rename from make/lzo.mk
rename to package/lzo/lzo.mk
diff --git a/make/m4.mk b/package/m4/m4.mk
similarity index 100%
rename from make/m4.mk
rename to package/m4/m4.mk
diff --git a/make/make.mk b/package/make/make.mk
similarity index 100%
rename from make/make.mk
rename to package/make/make.mk
diff --git a/make/microcom.mk b/package/microcom/microcom.mk
similarity index 100%
rename from make/microcom.mk
rename to package/microcom/microcom.mk
diff --git a/make/microwin.mk b/package/microwin/microwin.mk
similarity index 100%
rename from make/microwin.mk
rename to package/microwin/microwin.mk
diff --git a/make/mkdosfs.mk b/package/mkdosfs/mkdosfs.mk
similarity index 100%
rename from make/mkdosfs.mk
rename to package/mkdosfs/mkdosfs.mk
diff --git a/make/mke2fs.mk b/package/mke2fs/mke2fs.mk
similarity index 100%
rename from make/mke2fs.mk
rename to package/mke2fs/mke2fs.mk
diff --git a/make/mpg123.mk b/package/mpg123/mpg123.mk
similarity index 100%
rename from make/mpg123.mk
rename to package/mpg123/mpg123.mk
diff --git a/make/mrouted.mk b/package/mrouted/mrouted.mk
similarity index 100%
rename from make/mrouted.mk
rename to package/mrouted/mrouted.mk
diff --git a/make/nano.mk b/package/nano/nano.mk
similarity index 100%
rename from make/nano.mk
rename to package/nano/nano.mk
diff --git a/make/ncurses.mk b/package/ncurses/ncurses.mk
similarity index 98%
rename from make/ncurses.mk
rename to package/ncurses/ncurses.mk
index 03d8ce663..e2b464ae2 100644
--- a/make/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -5,7 +5,7 @@
 #
 #############################################################
 # Copyright (C) 2002 by Ken Restivo <ken@246gt.com>
-# $Id: ncurses.mk,v 1.35 2004/09/09 10:50:57 mjn3 Exp $
+# $Id: ncurses.mk,v 1.1 2004/10/09 01:24:04 andersen Exp $
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Library General Public License as
diff --git a/make/netkitbase.mk b/package/netkitbase/netkitbase.mk
similarity index 100%
rename from make/netkitbase.mk
rename to package/netkitbase/netkitbase.mk
diff --git a/make/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk
similarity index 100%
rename from make/netkittelnet.mk
rename to package/netkittelnet/netkittelnet.mk
diff --git a/make/netsnmp.mk b/package/netsnmp/netsnmp.mk
similarity index 100%
rename from make/netsnmp.mk
rename to package/netsnmp/netsnmp.mk
diff --git a/make/newt.mk b/package/newt/newt.mk
similarity index 100%
rename from make/newt.mk
rename to package/newt/newt.mk
diff --git a/make/ntp.mk b/package/ntp/ntp.mk
similarity index 100%
rename from make/ntp.mk
rename to package/ntp/ntp.mk
diff --git a/make/openssh.mk b/package/openssh/openssh.mk
similarity index 100%
rename from make/openssh.mk
rename to package/openssh/openssh.mk
diff --git a/make/openssl.mk b/package/openssl/openssl.mk
similarity index 100%
rename from make/openssl.mk
rename to package/openssl/openssl.mk
diff --git a/make/openvpn.mk b/package/openvpn/openvpn.mk
similarity index 100%
rename from make/openvpn.mk
rename to package/openvpn/openvpn.mk
diff --git a/make/patch.mk b/package/patch/patch.mk
similarity index 100%
rename from make/patch.mk
rename to package/patch/patch.mk
diff --git a/make/pciutils.mk b/package/pciutils/pciutils.mk
similarity index 100%
rename from make/pciutils.mk
rename to package/pciutils/pciutils.mk
diff --git a/make/pcmcia.mk b/package/pcmcia/pcmcia.mk
similarity index 100%
rename from make/pcmcia.mk
rename to package/pcmcia/pcmcia.mk
diff --git a/make/pppd.mk b/package/pppd/pppd.mk
similarity index 100%
rename from make/pppd.mk
rename to package/pppd/pppd.mk
diff --git a/make/procps.mk b/package/procps/procps.mk
similarity index 100%
rename from make/procps.mk
rename to package/procps/procps.mk
diff --git a/make/python.mk b/package/python/python.mk
similarity index 100%
rename from make/python.mk
rename to package/python/python.mk
diff --git a/make/raidtools.mk b/package/raidtools/raidtools.mk
similarity index 100%
rename from make/raidtools.mk
rename to package/raidtools/raidtools.mk
diff --git a/make/rxvt.mk b/package/rxvt/rxvt.mk
similarity index 100%
rename from make/rxvt.mk
rename to package/rxvt/rxvt.mk
diff --git a/make/sfdisk.mk b/package/sfdisk/sfdisk.mk
similarity index 100%
rename from make/sfdisk.mk
rename to package/sfdisk/sfdisk.mk
diff --git a/make/slang.mk b/package/slang/slang.mk
similarity index 100%
rename from make/slang.mk
rename to package/slang/slang.mk
diff --git a/make/socat.mk b/package/socat/socat.mk
similarity index 100%
rename from make/socat.mk
rename to package/socat/socat.mk
diff --git a/make/squashfsroot.mk b/package/squashfsroot/squashfsroot.mk
similarity index 100%
rename from make/squashfsroot.mk
rename to package/squashfsroot/squashfsroot.mk
diff --git a/make/strace.mk b/package/strace/strace.mk
similarity index 100%
rename from make/strace.mk
rename to package/strace/strace.mk
diff --git a/make/tar.mk b/package/tar/tar.mk
similarity index 100%
rename from make/tar.mk
rename to package/tar/tar.mk
diff --git a/make/tinylogin.mk b/package/tinylogin/tinylogin.mk
similarity index 100%
rename from make/tinylogin.mk
rename to package/tinylogin/tinylogin.mk
diff --git a/make/tinyx.mk b/package/tinyx/tinyx.mk
similarity index 100%
rename from make/tinyx.mk
rename to package/tinyx/tinyx.mk
diff --git a/make/tn5250.mk b/package/tn5250/tn5250.mk
similarity index 100%
rename from make/tn5250.mk
rename to package/tn5250/tn5250.mk
diff --git a/make/ttcp.mk b/package/ttcp/ttcp.mk
similarity index 100%
rename from make/ttcp.mk
rename to package/ttcp/ttcp.mk
diff --git a/make/udhcp.mk b/package/udhcp/udhcp.mk
similarity index 100%
rename from make/udhcp.mk
rename to package/udhcp/udhcp.mk
diff --git a/make/util-linux.mk b/package/util-linux/util-linux.mk
similarity index 100%
rename from make/util-linux.mk
rename to package/util-linux/util-linux.mk
diff --git a/make/valgrind.mk b/package/valgrind/valgrind.mk
similarity index 100%
rename from make/valgrind.mk
rename to package/valgrind/valgrind.mk
diff --git a/make/vtun.mk b/package/vtun/vtun.mk
similarity index 100%
rename from make/vtun.mk
rename to package/vtun/vtun.mk
diff --git a/make/wget.mk b/package/wget/wget.mk
similarity index 100%
rename from make/wget.mk
rename to package/wget/wget.mk
diff --git a/make/wtools.mk b/package/wtools/wtools.mk
similarity index 100%
rename from make/wtools.mk
rename to package/wtools/wtools.mk
diff --git a/make/zlib.mk b/package/zlib/zlib.mk
similarity index 100%
rename from make/zlib.mk
rename to package/zlib/zlib.mk