diff --git a/Makefile b/Makefile
index 7125508..db0a28d 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ DISK_SIZE = 6.0G
 SWAP_SIZE = 30
 SWAP_FILE = $(CHROOT)/.swap
 ARCH = amd64
-KERNEL_CONFIG = kernel.config.$(ARCH)
+KERNEL_CONFIG = configs/kernel.config.$(ARCH)
 MAKEOPTS = -j10 -l10
 PRUNE_CRITICAL = NO
 REMOVE_PORTAGE_TREE = YES
@@ -36,13 +36,13 @@ USEPKG = --usepkg --binpkg-respect-use=y
 RSYNC_MIRROR = rsync://rsync.gtlib.gatech.edu/gentoo/
 EMERGE_RSYNC = NO
 KERNEL = gentoo-sources
-PACKAGE_FILES = $(wildcard $(APPLIANCE)/package.*)
-WORLD = $(APPLIANCE)/world
+PACKAGE_FILES = $(wildcard appliances/$(APPLIANCE)/package.*)
+WORLD = appliances/$(APPLIANCE)/world
 EXTRA_WORLD =
-CRITICAL = $(APPLIANCE)/critical
+CRITICAL = appliances/$(APPLIANCE)/critical
 
 # Allow appliance to override variables
--include $(APPLIANCE)/$(APPLIANCE).cfg
+-include appliance/$(APPLIANCE)/$(APPLIANCE).cfg
 
 # Allow user to override variables
 -include $(profile).cfg
@@ -61,10 +61,10 @@ endif
 
 
 ifeq ($(PRUNE_CRITICAL),YES)
-	COPY_ARGS = --exclude-from=rsync-excludes \
-		--exclude-from=rsync-excludes-critical
+	COPY_ARGS = --exclude-from=configs/rsync-excludes \
+		--exclude-from=configs/rsync-excludes-critical
 else
-	COPY_ARGS = --exclude-from=rsync-excludes
+	COPY_ARGS = --exclude-from=configs/rsync-excludes
 endif
 
 ifeq ($(REMOVE_PORTAGE_TREE),YES)
@@ -92,7 +92,7 @@ $(RAW_IMAGE):
 	qemu-img create -f raw $(RAW_IMAGE) $(DISK_SIZE)
 
 partitions: $(RAW_IMAGE)
-	@./echo Creating partition layout
+	@scripts/echo Creating partition layout
 	parted -s $(RAW_IMAGE) mklabel gpt
 	parted -s $(RAW_IMAGE) mkpart primary 1 $(DISK_SIZE)
 	parted -s $(RAW_IMAGE) set 1 boot on
@@ -103,7 +103,7 @@ partitions: $(RAW_IMAGE)
 	touch partitions
 
 mounts: stage3
-	@./echo Creating chroot in $(CHROOT)
+	@scripts/echo Creating chroot in $(CHROOT)
 	mkdir -p $(CHROOT)
 	if [ ! -e mounts ] ; then \
 		mount -t proc none $(CHROOT)/proc; \
@@ -113,21 +113,21 @@ mounts: stage3
 	touch mounts
 
 portage-snapshot.tar.bz2:
-	@./echo You do not have a portage snapshot. Consider \"make sync_portage\"
+	@scripts/echo You do not have a portage snapshot. Consider \"make sync_portage\"
 	@exit 1
 
 
 sync_portage:
-	@./echo Grabbing latest portage snapshot
+	@scripts/echo Grabbing latest portage snapshot
 	rsync --no-motd -L $(RSYNC_MIRROR)/snapshots/portage-latest.tar.bz2 portage-snapshot.tar.bz2
 
 
 portage: portage-snapshot.tar.bz2 stage3
-	@./echo Unpacking portage snapshot
+	@scripts/echo Unpacking portage snapshot
 	rm -rf $(CHROOT)/usr/portage
 	tar xf portage-snapshot.tar.bz2 -C $(CHROOT)/usr
 ifeq ($(EMERGE_RSYNC),YES)
-	@./echo Syncing portage tree
+	@scripts/echo Syncing portage tree
 	$(inroot) emerge --sync --quiet
 endif
 ifdef PKGDIR
@@ -136,16 +136,16 @@ ifdef PKGDIR
 endif
 	touch portage
 
-preproot: stage3 mounts portage fstab
+preproot: stage3 mounts portage configs/fstab
 	cp -L /etc/resolv.conf $(CHROOT)/etc/
 	$(inroot) sed -i 's/root:.*/root::9797:0:::::/' /etc/shadow
-	cp fstab $(CHROOT)/etc/fstab
+	cp configs/fstab $(CHROOT)/etc/fstab
 	echo hostname=\"$(HOSTNAME)\" > $(CHROOT)/etc/conf.d/hostname
 	echo $(HOSTNAME) > $(CHROOT)/etc/hostname
 	touch preproot
 
 stage3-$(ARCH)-latest.tar.bz2:
-	@./echo You do not have a portage stage3 tarball. Consider \"make sync_stage3\"
+	@scripts/echo You do not have a portage stage3 tarball. Consider \"make sync_stage3\"
 	@exit 1
 
 sync_stage3:
@@ -156,23 +156,23 @@ sync_stage3:
 stage3: stage3-$(ARCH)-latest.tar.bz2
 	mkdir -p $(CHROOT)
 ifdef stage4-exists
-	@./echo Using stage4 tarball: $(STAGE4_TARBALL)
+	@scripts/echo Using stage4 tarball: $(STAGE4_TARBALL)
 	tar xpf "$(STAGE4_TARBALL)" -C $(CHROOT)
 else
-	@./echo Using stage3 tarball
+	@scripts/echo Using stage3 tarball
 	tar xpf stage3-$(ARCH)-latest.tar.bz2 -C $(CHROOT)
 endif
 	touch stage3
 
-compile_options: portage make.conf.$(ARCH) locale.gen $(PACKAGE_FILES)
-	cp make.conf.$(ARCH) $(CHROOT)/etc/portage/make.conf
+compile_options: portage configs/make.conf.$(ARCH) configs/locale.gen $(PACKAGE_FILES)
+	cp configs/make.conf.$(ARCH) $(CHROOT)/etc/portage/make.conf
 ifdef PKGDIR
 	echo PKGDIR="/var/portage/packages" >> $(CHROOT)/etc/portage/make.conf
 endif
 	echo ACCEPT_KEYWORDS=$(ACCEPT_KEYWORDS) >> $(CHROOT)/etc/portage/make.conf
-	-[ -f "$(APPLIANCE)/make.conf" ] && cat "$(APPLIANCE)/make.conf" >> $(CHROOT)/etc/portage/make.conf
+	-[ -f "appliances/$(APPLIANCE)/make.conf" ] && cat "appliances/$(APPLIANCE)/make.conf" >> $(CHROOT)/etc/portage/make.conf
 	$(inroot) eselect profile set 1
-	cp locale.gen $(CHROOT)/etc/locale.gen
+	cp configs/locale.gen $(CHROOT)/etc/locale.gen
 	$(inroot) locale-gen
 	mkdir -p $(CHROOT)/etc/portage
 ifdef PACKAGE_FILES
@@ -183,13 +183,13 @@ endif
 base_system: mounts compile_options
 	touch base_system
 
-kernel: base_system $(KERNEL_CONFIG) kernel.sh
+kernel: base_system $(KERNEL_CONFIG) scripts/kernel.sh
 	$(inroot) cp /usr/share/zoneinfo/$(TIMEZONE) /etc/localtime
 	echo $(TIMEZONE) > "$(CHROOT)"/etc/timezone
 ifneq ($(EXTERNAL_KERNEL),YES)
-	@./echo Configuring kernel
+	@scripts/echo Configuring kernel
 	cp $(KERNEL_CONFIG) $(CHROOT)/root/kernel.config
-	cp kernel.sh $(CHROOT)/tmp/kernel.sh
+	cp scripts/kernel.sh $(CHROOT)/tmp/kernel.sh
 	KERNEL=$(KERNEL) EMERGE="$(EMERGE)" USEPKG="$(USEPKG)" MAKEOPTS="$(MAKEOPTS)" \
 	   $(inroot) /bin/sh /tmp/kernel.sh
 	rm -f $(CHROOT)/tmp/kernel.sh
@@ -198,20 +198,18 @@ endif
 
 $(SWAP_FILE): preproot
 ifneq ($(SWAP_SIZE),0)
-	@./echo Creating swap file: $(SWAP_FILE)
+	@scripts/echo Creating swap file: $(SWAP_FILE)
 	dd if=/dev/zero of=$(SWAP_FILE) bs=1M count=$(SWAP_SIZE)
 	/sbin/mkswap $(SWAP_FILE)
 else
 	sed -i '/swap/d' $(CHROOT)/etc/fstab
 endif
 
-sysconfig: preproot acpi.start $(SWAP_FILE)
+sysconfig: preproot scripts/acpi.start $(SWAP_FILE)
 	@echo $(VIRTIO)
 ifeq ($(VIRTIO),YES)
 	sed -i 's/sda/vda/' $(CHROOT)/etc/fstab
 	sed -i 's:clock_hctosys="YES":clock_hctosys="NO":g' "$(CHROOT)/etc/conf.d/hwclock"
-	sed -i '/^rc_sys=/d' "$(CHROOT)/etc/rc.conf"
-	echo 'rc_sys=""' >> "$(CHROOT)/etc/rc.conf"
 endif
 ifeq ($(HEADLESS),YES)
 	sed -i 's/^#s0:/s0:/' $(CHROOT)/etc/inittab
@@ -225,11 +223,11 @@ endif
 	$(inroot) ln -nsf net.lo /etc/init.d/net.eth0
 	$(inroot) ln -nsf /etc/init.d/net.eth0 /etc/runlevels/default/net.eth0
 	$(inroot) rm -f /etc/runlevels/boot/consolefont
-	cp -a acpi.start $(CHROOT)/etc/local.d
+	cp -a scripts/acpi.start $(CHROOT)/etc/local.d
 	touch sysconfig
 
 systools: sysconfig compile_options
-	@./echo Installing standard system tools
+	@scripts/echo Installing standard system tools
 	$(inroot) $(EMERGE) -n $(USEPKG) app-admin/metalog
 	$(inroot) /sbin/rc-update add metalog default
 ifeq ($(DASH),YES)
@@ -242,24 +240,24 @@ ifeq ($(DASH),YES)
 endif
 	touch systools
 
-grub: stage3 grub.conf kernel
+grub: stage3 configs/grub.conf kernel scripts/grub-headless.sed
 ifneq ($(EXTERNAL_KERNEL),YES)
-	@./echo Installing Grub
+	@scripts/echo Installing Grub
 	$(inroot) $(EMERGE) -nN $(USEPKG) sys-boot/grub-static
-	cp grub.conf $(CHROOT)/boot/grub/grub.conf
+	cp configs/grub.conf $(CHROOT)/boot/grub/grub.conf
 ifeq ($(VIRTIO),YES)
 	sed -i 's/sda/vda/' $(CHROOT)/boot/grub/grub.conf
 endif
 ifeq ($(HEADLESS),YES)
-	sed -i -f grub-headless.sed $(CHROOT)/boot/grub/grub.conf
+	sed -i -f scripts/grub-headless.sed $(CHROOT)/boot/grub/grub.conf
 endif
 endif
 	touch grub
 
-build-software: systools issue etc-update.conf $(CRITICAL) $(WORLD)
-	@./echo Building $(APPLIANCE)-specific software
-	$(MAKE) -C $(APPLIANCE) preinstall
-	cp etc-update.conf $(CHROOT)/etc/
+build-software: systools configs/issue configs/etc-update.conf $(CRITICAL) $(WORLD)
+	@scripts/echo Building $(APPLIANCE)-specific software
+	$(MAKE) -C appliances/$(APPLIANCE) preinstall
+	cp configs/etc-update.conf $(CHROOT)/etc/
 	
 	if test `stat -c "%s" $(WORLD)` -ne 0 ; then \
 		$(inroot) $(EMERGE) $(USEPKG) --update --newuse --deep `cat $(WORLD)` $(EXTRA_WORLD); \
@@ -268,17 +266,17 @@ build-software: systools issue etc-update.conf $(CRITICAL) $(WORLD)
 	fi
 	$(gcc_config)
 	
-	@./echo Running revdep-rebuild
+	@scripts/echo Running revdep-rebuild
 	# Need gentoolkit to run revdep-rebuild
 	$(inroot) emerge $(USEPKG) @preserved-rebuild
 	
-	cp issue $(CHROOT)/etc/issue
+	cp configs/issue $(CHROOT)/etc/issue
 	$(gcc_config)
 	$(inroot) $(EMERGE) $(USEPKG) --update --newuse --deep world
 	$(inroot) $(EMERGE) --depclean --with-bdeps=n
 	$(gcc_config)
 	EDITOR=/usr/bin/nano $(inroot) etc-update
-	$(MAKE) -C $(APPLIANCE) postinstall
+	$(MAKE) -C appliances/$(APPLIANCE) postinstall
 ifeq ($(UDEV),NO)
 	rm -f $(CHROOT)/etc/runlevels/sysinit/udev
 	$(inroot) $(EMERGE) -c sys-fs/udev
@@ -309,27 +307,27 @@ endif
 device-map: $(RAW_IMAGE)
 	echo '(hd0) ' $(RAW_IMAGE) > device-map
 
-image: $(STAGE4_TARBALL) partitions device-map grub.shell motd.sh
-	@./echo Installing files to $(RAW_IMAGE) 
+image: $(STAGE4_TARBALL) partitions device-map scripts/grub.shell scripts/motd.sh
+	@scripts/echo Installing files to $(RAW_IMAGE) 
 	mkdir -p loop
 	mount -o noatime $(NBD_DEV)p1 loop
 	tar -Sxf $(STAGE4_TARBALL) --numeric-owner $(COPY_ARGS) -C loop
-	./motd.sh $(EXTERNAL_KERNEL) $(VIRTIO) $(DISK_SIZE) $(SWAP_SIZE) $(UDEV) $(DASH) $(ARCH) > loop/etc/motd
+	scripts/motd.sh $(EXTERNAL_KERNEL) $(VIRTIO) $(DISK_SIZE) $(SWAP_SIZE) $(UDEV) $(DASH) $(ARCH) > loop/etc/motd
 ifneq ($(EXTERNAL_KERNEL),YES)
-	loop/sbin/grub --device-map=device-map --no-floppy --batch < grub.shell
+	loop/sbin/grub --device-map=device-map --no-floppy --batch < scripts/grub.shell
 endif
 	umount -l loop
 	rmdir loop
 	qemu-nbd -d $(NBD_DEV)
 
 $(QCOW_IMAGE): image
-	@./echo Creating $(QCOW_IMAGE)
+	@scripts/echo Creating $(QCOW_IMAGE)
 	qemu-img convert -f raw -O qcow2 -c $(RAW_IMAGE) $(QCOW_IMAGE)
 
 qcow: $(QCOW_IMAGE)
 
 $(XVA_IMAGE): image
-	@./echo Creating $(XVA_IMAGE)
+	@scripts/echo Creating $(XVA_IMAGE)
 	xva.py --disk=$(RAW_IMAGE) --is-hvm --memory=256 --vcpus=1 --name=$(APPLIANCE) \
 		--filename=$(XVA_IMAGE)
 
@@ -337,13 +335,13 @@ xva: $(XVA_IMAGE)
 
 
 $(VMDK_IMAGE): image
-	@./echo Creating $(VMDK_IMAGE)
+	@scripts/echo Creating $(VMDK_IMAGE)
 	qemu-img convert -f raw -O vmdk $(RAW_IMAGE) $(VMDK_IMAGE)
 
 vmdk: $(VMDK_IMAGE)
 
-stage4: software kernel rsync-excludes rsync-excludes-critical grub
-	@./echo Creating stage4 tarball: $(STAGE4_TARBALL)
+stage4: software kernel configs/rsync-excludes configs/rsync-excludes-critical grub
+	@scripts/echo Creating stage4 tarball: $(STAGE4_TARBALL)
 	mkdir -p stage4
 	mkdir -p gentoo
 	mount -o bind $(CHROOT) gentoo
@@ -357,7 +355,7 @@ $(STAGE4_TARBALL):
 
 
 umount: 
-	@./echo Attempting to unmount chroot mounts
+	@scripts/echo Attempting to unmount chroot mounts
 ifdef PKGDIR
 	umount -l $(CHROOT)/var/portage/packages
 endif
@@ -384,8 +382,12 @@ distclean:
 	rm -f latest-stage3.txt stage3-*-latest.tar.bz2
 	rm -f portage-snapshot.tar.bz2
 
+appliance-list:
+	@scripts/echo 'Available appliances:'
+	@/bin/ls appliances
+
 help:
-	@./echo 'Help targets (this is not a comprehensive list)'
+	@scripts/echo 'Help targets (this is not a comprehensive list)'
 	@echo
 	@echo 'sync_portage             - Download the latest portage snapshot'
 	@echo 'sync_stage3              - Download the latest stage3 tarball'
@@ -393,12 +395,14 @@ help:
 	@echo 'software                 - Build software into a chroot'
 	@echo 'clean                    - Unmount chroot and clean directory'
 	@echo 'realclean                - Clean and remove image files'
-	@./echo 'Images'
+	@scripts/echo 'Images'
 	@echo 'image                    - Build a raw VM image from stage4'
 	@echo 'qcow                     - Build a qcow VM image from a raw image'
 	@echo 'vmdk                     - Build a vmdk image from a raw image'
 	@echo 'xva                      - Build an xva image from a raw image'
-	@./echo 'Variables'
+	@echo 'appliance-list           - List built-in appliances'
+	@echo 'help                     - Show this help'
+	@scripts/echo 'Variables'
 	@echo 'APPLIANCE=               - The appliance to build'
 	@echo 'HOSTNAME=                - Hostname to give appliance'
 	@echo 'TIMEZONE=                - Timezone to set for the appliance'
@@ -414,7 +418,7 @@ help:
 	@echo 'NBD_DEV=/dev/nbd0        - NBD device to use when manipulating images'
 	@echo 'ENABLE_SSHD=YES          - Enable sshd to start automatically in the image'
 	@echo
-	@./echo 'Example'
+	@scripts/echo 'Example'
 	@echo 'make APPLIANCE=mongodb HEADLESS=YES VIRTIO=YES stage4 qcow clean'
 
-.PHONY: qcow vmdk clean realclean distclean remove_checkpoints stage4 build-software image stage4 help
+.PHONY: qcow vmdk clean realclean distclean remove_checkpoints stage4 build-software image stage4 help appliance-list
diff --git a/airport/Makefile b/appliances/airport/Makefile
similarity index 100%
rename from airport/Makefile
rename to appliances/airport/Makefile
diff --git a/airport/airport.service b/appliances/airport/airport.service
similarity index 100%
rename from airport/airport.service
rename to appliances/airport/airport.service
diff --git a/airport/critical b/appliances/airport/critical
similarity index 100%
rename from airport/critical
rename to appliances/airport/critical
diff --git a/airport/issue b/appliances/airport/issue
similarity index 100%
rename from airport/issue
rename to appliances/airport/issue
diff --git a/airport/local.start b/appliances/airport/local.start
similarity index 100%
rename from airport/local.start
rename to appliances/airport/local.start
diff --git a/airport/local.stop b/appliances/airport/local.stop
similarity index 100%
rename from airport/local.stop
rename to appliances/airport/local.stop
diff --git a/airport/make.conf b/appliances/airport/make.conf
similarity index 100%
rename from airport/make.conf
rename to appliances/airport/make.conf
diff --git a/airport/nginx.conf b/appliances/airport/nginx.conf
similarity index 100%
rename from airport/nginx.conf
rename to appliances/airport/nginx.conf
diff --git a/airport/package.keywords b/appliances/airport/package.keywords
similarity index 100%
rename from airport/package.keywords
rename to appliances/airport/package.keywords
diff --git a/airport/package.use b/appliances/airport/package.use
similarity index 100%
rename from airport/package.use
rename to appliances/airport/package.use
diff --git a/airport/settings.py b/appliances/airport/settings.py
similarity index 100%
rename from airport/settings.py
rename to appliances/airport/settings.py
diff --git a/airport/settings_europe.py b/appliances/airport/settings_europe.py
similarity index 100%
rename from airport/settings_europe.py
rename to appliances/airport/settings_europe.py
diff --git a/airport/start-airport b/appliances/airport/start-airport
similarity index 100%
rename from airport/start-airport
rename to appliances/airport/start-airport
diff --git a/airport/stop-airport b/appliances/airport/stop-airport
similarity index 100%
rename from airport/stop-airport
rename to appliances/airport/stop-airport
diff --git a/airport/stop-game b/appliances/airport/stop-game
similarity index 100%
rename from airport/stop-game
rename to appliances/airport/stop-game
diff --git a/airport/world b/appliances/airport/world
similarity index 100%
rename from airport/world
rename to appliances/airport/world
diff --git a/base/Makefile b/appliances/base/Makefile
similarity index 100%
rename from base/Makefile
rename to appliances/base/Makefile
diff --git a/base/critical b/appliances/base/critical
similarity index 100%
rename from base/critical
rename to appliances/base/critical
diff --git a/base/package.keywords b/appliances/base/package.keywords
similarity index 100%
rename from base/package.keywords
rename to appliances/base/package.keywords
diff --git a/base/package.use b/appliances/base/package.use
similarity index 100%
rename from base/package.use
rename to appliances/base/package.use
diff --git a/base/world b/appliances/base/world
similarity index 100%
rename from base/world
rename to appliances/base/world
diff --git a/dpaste/Makefile b/appliances/dpaste/Makefile
similarity index 100%
rename from dpaste/Makefile
rename to appliances/dpaste/Makefile
diff --git a/dpaste/bash_profile b/appliances/dpaste/bash_profile
similarity index 100%
rename from dpaste/bash_profile
rename to appliances/dpaste/bash_profile
diff --git a/dpaste/critical b/appliances/dpaste/critical
similarity index 100%
rename from dpaste/critical
rename to appliances/dpaste/critical
diff --git a/dpaste/dpaste.init b/appliances/dpaste/dpaste.init
similarity index 100%
rename from dpaste/dpaste.init
rename to appliances/dpaste/dpaste.init
diff --git a/dpaste/firstboot.start b/appliances/dpaste/firstboot.start
similarity index 100%
rename from dpaste/firstboot.start
rename to appliances/dpaste/firstboot.start
diff --git a/dpaste/make.conf b/appliances/dpaste/make.conf
similarity index 100%
rename from dpaste/make.conf
rename to appliances/dpaste/make.conf
diff --git a/dpaste/nginx.conf b/appliances/dpaste/nginx.conf
similarity index 100%
rename from dpaste/nginx.conf
rename to appliances/dpaste/nginx.conf
diff --git a/dpaste/package.keywords b/appliances/dpaste/package.keywords
similarity index 100%
rename from dpaste/package.keywords
rename to appliances/dpaste/package.keywords
diff --git a/dpaste/package.use b/appliances/dpaste/package.use
similarity index 100%
rename from dpaste/package.use
rename to appliances/dpaste/package.use
diff --git a/dpaste/settings.py b/appliances/dpaste/settings.py
similarity index 100%
rename from dpaste/settings.py
rename to appliances/dpaste/settings.py
diff --git a/dpaste/world b/appliances/dpaste/world
similarity index 100%
rename from dpaste/world
rename to appliances/dpaste/world
diff --git a/drupal/Makefile b/appliances/drupal/Makefile
similarity index 100%
rename from drupal/Makefile
rename to appliances/drupal/Makefile
diff --git a/drupal/critical b/appliances/drupal/critical
similarity index 100%
rename from drupal/critical
rename to appliances/drupal/critical
diff --git a/drupal/firstboot.start b/appliances/drupal/firstboot.start
similarity index 100%
rename from drupal/firstboot.start
rename to appliances/drupal/firstboot.start
diff --git a/drupal/make.conf b/appliances/drupal/make.conf
similarity index 100%
rename from drupal/make.conf
rename to appliances/drupal/make.conf
diff --git a/drupal/motd.sh b/appliances/drupal/motd.sh
similarity index 100%
rename from drupal/motd.sh
rename to appliances/drupal/motd.sh
diff --git a/drupal/package.keywords b/appliances/drupal/package.keywords
similarity index 100%
rename from drupal/package.keywords
rename to appliances/drupal/package.keywords
diff --git a/drupal/package.use b/appliances/drupal/package.use
similarity index 100%
rename from drupal/package.use
rename to appliances/drupal/package.use
diff --git a/drupal/world b/appliances/drupal/world
similarity index 100%
rename from drupal/world
rename to appliances/drupal/world
diff --git a/gnome/Makefile b/appliances/gnome/Makefile
similarity index 100%
rename from gnome/Makefile
rename to appliances/gnome/Makefile
diff --git a/gnome/critical b/appliances/gnome/critical
similarity index 100%
rename from gnome/critical
rename to appliances/gnome/critical
diff --git a/gnome/custom.conf b/appliances/gnome/custom.conf
similarity index 100%
rename from gnome/custom.conf
rename to appliances/gnome/custom.conf
diff --git a/gnome/dhclient.conf b/appliances/gnome/dhclient.conf
similarity index 100%
rename from gnome/dhclient.conf
rename to appliances/gnome/dhclient.conf
diff --git a/gnome/make.conf b/appliances/gnome/make.conf
similarity index 100%
rename from gnome/make.conf
rename to appliances/gnome/make.conf
diff --git a/gnome/package.use b/appliances/gnome/package.use
similarity index 100%
rename from gnome/package.use
rename to appliances/gnome/package.use
diff --git a/gnome/world b/appliances/gnome/world
similarity index 100%
rename from gnome/world
rename to appliances/gnome/world
diff --git a/hemp-node/Makefile b/appliances/hemp-node/Makefile
similarity index 100%
rename from hemp-node/Makefile
rename to appliances/hemp-node/Makefile
diff --git a/hemp-node/README b/appliances/hemp-node/README
similarity index 100%
rename from hemp-node/README
rename to appliances/hemp-node/README
diff --git a/hemp-node/critical b/appliances/hemp-node/critical
similarity index 100%
rename from hemp-node/critical
rename to appliances/hemp-node/critical
diff --git a/hemp-node/package.keywords b/appliances/hemp-node/package.keywords
similarity index 100%
rename from hemp-node/package.keywords
rename to appliances/hemp-node/package.keywords
diff --git a/hemp-node/package.use b/appliances/hemp-node/package.use
similarity index 88%
rename from hemp-node/package.use
rename to appliances/hemp-node/package.use
index c69b398..6c2e66b 100644
--- a/hemp-node/package.use
+++ b/appliances/hemp-node/package.use
@@ -2,6 +2,7 @@ app-editors/nano ncurses
 dev-db/sqlite extensions
 dev-lang/python ssl sqlite threads xml
 dev-vcs/git curl
+dev-vcs/mercurial python_targets_python2_7
 net-misc/curl ssl threads curl_ssl_openssl
 sys-apps/hwids udev
 sys-apps/kmod tools
diff --git a/hemp-node/world b/appliances/hemp-node/world
similarity index 100%
rename from hemp-node/world
rename to appliances/hemp-node/world
diff --git a/kde/Makefile b/appliances/kde/Makefile
similarity index 100%
rename from kde/Makefile
rename to appliances/kde/Makefile
diff --git a/kde/Xaccess b/appliances/kde/Xaccess
similarity index 100%
rename from kde/Xaccess
rename to appliances/kde/Xaccess
diff --git a/kde/critical b/appliances/kde/critical
similarity index 100%
rename from kde/critical
rename to appliances/kde/critical
diff --git a/kde/kdm.start b/appliances/kde/kdm.start
similarity index 100%
rename from kde/kdm.start
rename to appliances/kde/kdm.start
diff --git a/kde/kdmrc b/appliances/kde/kdmrc
similarity index 100%
rename from kde/kdmrc
rename to appliances/kde/kdmrc
diff --git a/kde/knotifyrc b/appliances/kde/knotifyrc
similarity index 100%
rename from kde/knotifyrc
rename to appliances/kde/knotifyrc
diff --git a/kde/make.conf b/appliances/kde/make.conf
similarity index 100%
rename from kde/make.conf
rename to appliances/kde/make.conf
diff --git a/kde/package.use b/appliances/kde/package.use
similarity index 100%
rename from kde/package.use
rename to appliances/kde/package.use
diff --git a/kde/world b/appliances/kde/world
similarity index 100%
rename from kde/world
rename to appliances/kde/world
diff --git a/mongodb/Makefile b/appliances/mongodb/Makefile
similarity index 74%
rename from mongodb/Makefile
rename to appliances/mongodb/Makefile
index 14da549..5a112da 100644
--- a/mongodb/Makefile
+++ b/appliances/mongodb/Makefile
@@ -3,7 +3,7 @@ preinstall:
 	$(inroot) $(EMERGE) -1n $(USEPKG) dev-lang/python:2.7
 
 postinstall:
-	sed -i 's/127\.0\.0\.1/0.0.0.0/g' "$(CHROOT)"/etc/conf.d/mongodb
+	sed -i 's/127\.0\.0\.1/0.0.0.0/g' "$(CHROOT)"/etc/mongodb.conf
 	$(inroot) rc-update add mongodb default
 
 clean:
diff --git a/mongodb/critical b/appliances/mongodb/critical
similarity index 100%
rename from mongodb/critical
rename to appliances/mongodb/critical
diff --git a/mongodb/package.keywords b/appliances/mongodb/package.keywords
similarity index 100%
rename from mongodb/package.keywords
rename to appliances/mongodb/package.keywords
diff --git a/mongodb/package.use b/appliances/mongodb/package.use
similarity index 100%
rename from mongodb/package.use
rename to appliances/mongodb/package.use
diff --git a/mongodb/world b/appliances/mongodb/world
similarity index 100%
rename from mongodb/world
rename to appliances/mongodb/world
diff --git a/owncloud/Makefile b/appliances/owncloud/Makefile
similarity index 100%
rename from owncloud/Makefile
rename to appliances/owncloud/Makefile
diff --git a/owncloud/critical b/appliances/owncloud/critical
similarity index 100%
rename from owncloud/critical
rename to appliances/owncloud/critical
diff --git a/owncloud/make.conf b/appliances/owncloud/make.conf
similarity index 100%
rename from owncloud/make.conf
rename to appliances/owncloud/make.conf
diff --git a/owncloud/package.keywords b/appliances/owncloud/package.keywords
similarity index 100%
rename from owncloud/package.keywords
rename to appliances/owncloud/package.keywords
diff --git a/owncloud/package.provided b/appliances/owncloud/package.provided
similarity index 100%
rename from owncloud/package.provided
rename to appliances/owncloud/package.provided
diff --git a/owncloud/package.use b/appliances/owncloud/package.use
similarity index 100%
rename from owncloud/package.use
rename to appliances/owncloud/package.use
diff --git a/owncloud/world b/appliances/owncloud/world
similarity index 100%
rename from owncloud/world
rename to appliances/owncloud/world
diff --git a/teamplayer/Makefile b/appliances/teamplayer/Makefile
similarity index 100%
rename from teamplayer/Makefile
rename to appliances/teamplayer/Makefile
diff --git a/teamplayer/bash_profile b/appliances/teamplayer/bash_profile
similarity index 100%
rename from teamplayer/bash_profile
rename to appliances/teamplayer/bash_profile
diff --git a/teamplayer/critical b/appliances/teamplayer/critical
similarity index 100%
rename from teamplayer/critical
rename to appliances/teamplayer/critical
diff --git a/teamplayer/issue b/appliances/teamplayer/issue
similarity index 100%
rename from teamplayer/issue
rename to appliances/teamplayer/issue
diff --git a/teamplayer/local.start b/appliances/teamplayer/local.start
similarity index 100%
rename from teamplayer/local.start
rename to appliances/teamplayer/local.start
diff --git a/teamplayer/local.stop b/appliances/teamplayer/local.stop
similarity index 100%
rename from teamplayer/local.stop
rename to appliances/teamplayer/local.stop
diff --git a/teamplayer/make.conf b/appliances/teamplayer/make.conf
similarity index 100%
rename from teamplayer/make.conf
rename to appliances/teamplayer/make.conf
diff --git a/teamplayer/nginx.conf b/appliances/teamplayer/nginx.conf
similarity index 100%
rename from teamplayer/nginx.conf
rename to appliances/teamplayer/nginx.conf
diff --git a/teamplayer/package.accept_keywords b/appliances/teamplayer/package.accept_keywords
similarity index 100%
rename from teamplayer/package.accept_keywords
rename to appliances/teamplayer/package.accept_keywords
diff --git a/teamplayer/package.use b/appliances/teamplayer/package.use
similarity index 100%
rename from teamplayer/package.use
rename to appliances/teamplayer/package.use
diff --git a/teamplayer/settings_local.py b/appliances/teamplayer/settings_local.py
similarity index 100%
rename from teamplayer/settings_local.py
rename to appliances/teamplayer/settings_local.py
diff --git a/teamplayer/start-teamplayer b/appliances/teamplayer/start-teamplayer
similarity index 100%
rename from teamplayer/start-teamplayer
rename to appliances/teamplayer/start-teamplayer
diff --git a/teamplayer/stop-teamplayer b/appliances/teamplayer/stop-teamplayer
similarity index 100%
rename from teamplayer/stop-teamplayer
rename to appliances/teamplayer/stop-teamplayer
diff --git a/teamplayer/teamplayer.service b/appliances/teamplayer/teamplayer.service
similarity index 100%
rename from teamplayer/teamplayer.service
rename to appliances/teamplayer/teamplayer.service
diff --git a/teamplayer/urls.py b/appliances/teamplayer/urls.py
similarity index 100%
rename from teamplayer/urls.py
rename to appliances/teamplayer/urls.py
diff --git a/teamplayer/world b/appliances/teamplayer/world
similarity index 100%
rename from teamplayer/world
rename to appliances/teamplayer/world
diff --git a/x/Makefile b/appliances/x/Makefile
similarity index 100%
rename from x/Makefile
rename to appliances/x/Makefile
diff --git a/x/critical b/appliances/x/critical
similarity index 100%
rename from x/critical
rename to appliances/x/critical
diff --git a/x/make.conf b/appliances/x/make.conf
similarity index 100%
rename from x/make.conf
rename to appliances/x/make.conf
diff --git a/x/package.keywords b/appliances/x/package.keywords
similarity index 100%
rename from x/package.keywords
rename to appliances/x/package.keywords
diff --git a/x/package.use b/appliances/x/package.use
similarity index 100%
rename from x/package.use
rename to appliances/x/package.use
diff --git a/x/world b/appliances/x/world
similarity index 100%
rename from x/world
rename to appliances/x/world
diff --git a/x/xdm.start b/appliances/x/xdm.start
similarity index 100%
rename from x/xdm.start
rename to appliances/x/xdm.start
diff --git a/x/xdm/Xaccess b/appliances/x/xdm/Xaccess
similarity index 100%
rename from x/xdm/Xaccess
rename to appliances/x/xdm/Xaccess
diff --git a/x/xdm/Xservers b/appliances/x/xdm/Xservers
similarity index 100%
rename from x/xdm/Xservers
rename to appliances/x/xdm/Xservers
diff --git a/x/xdm/xdm-config b/appliances/x/xdm/xdm-config
similarity index 100%
rename from x/xdm/xdm-config
rename to appliances/x/xdm/xdm-config
diff --git a/xfce/Makefile b/appliances/xfce/Makefile
similarity index 100%
rename from xfce/Makefile
rename to appliances/xfce/Makefile
diff --git a/xfce/critical b/appliances/xfce/critical
similarity index 100%
rename from xfce/critical
rename to appliances/xfce/critical
diff --git a/xfce/make.conf b/appliances/xfce/make.conf
similarity index 100%
rename from xfce/make.conf
rename to appliances/xfce/make.conf
diff --git a/xfce/package.keywords b/appliances/xfce/package.keywords
similarity index 100%
rename from xfce/package.keywords
rename to appliances/xfce/package.keywords
diff --git a/xfce/package.use b/appliances/xfce/package.use
similarity index 100%
rename from xfce/package.use
rename to appliances/xfce/package.use
diff --git a/xfce/world b/appliances/xfce/world
similarity index 100%
rename from xfce/world
rename to appliances/xfce/world
diff --git a/xfce/xdm.start b/appliances/xfce/xdm.start
similarity index 100%
rename from xfce/xdm.start
rename to appliances/xfce/xdm.start
diff --git a/xfce/xdm/Xaccess b/appliances/xfce/xdm/Xaccess
similarity index 100%
rename from xfce/xdm/Xaccess
rename to appliances/xfce/xdm/Xaccess
diff --git a/xfce/xdm/Xservers b/appliances/xfce/xdm/Xservers
similarity index 100%
rename from xfce/xdm/Xservers
rename to appliances/xfce/xdm/Xservers
diff --git a/xfce/xdm/xdm-config b/appliances/xfce/xdm/xdm-config
similarity index 100%
rename from xfce/xdm/xdm-config
rename to appliances/xfce/xdm/xdm-config
diff --git a/etc-update.conf b/configs/etc-update.conf
similarity index 100%
rename from etc-update.conf
rename to configs/etc-update.conf
diff --git a/fstab b/configs/fstab
similarity index 100%
rename from fstab
rename to configs/fstab
diff --git a/grub.conf b/configs/grub.conf
similarity index 100%
rename from grub.conf
rename to configs/grub.conf
diff --git a/issue b/configs/issue
similarity index 100%
rename from issue
rename to configs/issue
diff --git a/kernel.config.amd64 b/configs/kernel.config.amd64
similarity index 100%
rename from kernel.config.amd64
rename to configs/kernel.config.amd64
diff --git a/kernel.config.x86 b/configs/kernel.config.x86
similarity index 100%
rename from kernel.config.x86
rename to configs/kernel.config.x86
diff --git a/locale.gen b/configs/locale.gen
similarity index 100%
rename from locale.gen
rename to configs/locale.gen
diff --git a/make.conf.amd64 b/configs/make.conf.amd64
similarity index 65%
rename from make.conf.amd64
rename to configs/make.conf.amd64
index 8cd32db..211c388 100644
--- a/make.conf.amd64
+++ b/configs/make.conf.amd64
@@ -1,5 +1,5 @@
-CFLAGS="-Os"
-CXXFLAGS="-Os"
+CFLAGS="-Os  -Qn -s"
+CXXFLAGS="-Os -Qn -s"
 CHOST="x86_64-pc-linux-gnu"
 MAKEOPTS="-j2"
 USE="-* nptl pam unicode"
@@ -9,6 +9,6 @@ EMERGE_WARNING_DELAY="0"
 AUTO_CLEAN="yes"
 EPAUSE_IGNORE="1"
 EMERGE_DEFAULT_OPTS="--jobs=2 --autounmask=n"
-FEATURES="noinfo -test nodoc noman unmerge-orphans buildpkg notitles parallel-fetch"
+FEATURES="noinfo -test nodoc noman nostrip unmerge-orphans buildpkg notitles parallel-fetch"
 CURL_SSL="openssl"
 PYTHON_TARGETS="python3_3"
diff --git a/make.conf.x86 b/configs/make.conf.x86
similarity index 66%
rename from make.conf.x86
rename to configs/make.conf.x86
index 08f8ec4..ab70690 100644
--- a/make.conf.x86
+++ b/configs/make.conf.x86
@@ -1,5 +1,5 @@
-CFLAGS="-Os"
-CXXFLAGS="-Os"
+CFLAGS="-Os -Qn -s"
+CXXFLAGS="-Os -Qn -s"
 CHOST="i686-pc-linux-gnu"
 MAKEOPTS="-j2"
 USE="-* nptl pam unicode"
@@ -9,7 +9,7 @@ EMERGE_WARNING_DELAY="0"
 AUTO_CLEAN="yes"
 EPAUSE_IGNORE="1"
 EMERGE_DEFAULT_OPTS="--jobs=2 --autounmask=n"
-FEATURES="noinfo -test nodoc noman unmerge-orphans buildpkg notitles parallel-fetch"
+FEATURES="noinfo -test nodoc noman nostrip unmerge-orphans buildpkg notitles parallel-fetch"
 CURL_SSL="openssl"
 PYTHON_TARGETS="python3_3"
 ABI_X86="32"
diff --git a/rsync-excludes b/configs/rsync-excludes
similarity index 100%
rename from rsync-excludes
rename to configs/rsync-excludes
diff --git a/rsync-excludes-critical b/configs/rsync-excludes-critical
similarity index 100%
rename from rsync-excludes-critical
rename to configs/rsync-excludes-critical
diff --git a/acpi.start b/scripts/acpi.start
similarity index 100%
rename from acpi.start
rename to scripts/acpi.start
diff --git a/echo b/scripts/echo
similarity index 100%
rename from echo
rename to scripts/echo
diff --git a/grub-headless.sed b/scripts/grub-headless.sed
similarity index 100%
rename from grub-headless.sed
rename to scripts/grub-headless.sed
diff --git a/grub.shell b/scripts/grub.shell
similarity index 100%
rename from grub.shell
rename to scripts/grub.shell
diff --git a/kernel.sh b/scripts/kernel.sh
similarity index 100%
rename from kernel.sh
rename to scripts/kernel.sh
diff --git a/motd.sh b/scripts/motd.sh
similarity index 100%
rename from motd.sh
rename to scripts/motd.sh