restructuring...

254 files changed, 265 insertions, 155 deletions

diff --git a/remote/tools/busybox/busybox.build b/remote/modules/busybox/busybox.build
index 1a765532..bc2adc64 100644
--- a/remote/tools/busybox/busybox.build
+++ b/remote/modules/busybox/busybox.build
@@ -16,7 +16,7 @@ build()
 		pinfo "Running make"
 		make -j5 || perror "failed."
 		pinfo "Running make install"
-		make CONFIG_PREFIX="${TOOL_DIR}"/"${TOOL}"/build/"${PREFIX}" install || perror "failed"
+		make CONFIG_PREFIX="${MODULE_DIR}"/build/"${PREFIX}" install || perror "failed"
 		cd -
 		touch .built
 	fi
diff --git a/remote/tools/busybox/busybox.conf b/remote/modules/busybox/busybox.conf
index f7c866f2..f7c866f2 100644
--- a/remote/tools/busybox/busybox.conf
+++ b/remote/modules/busybox/busybox.conf
diff --git a/remote/tools/consolekit/consolekit.build b/remote/modules/consolekit/consolekit.build
index 35170256..ac31f9ed 100644
--- a/remote/tools/consolekit/consolekit.build
+++ b/remote/modules/consolekit/consolekit.build
@@ -5,12 +5,11 @@ fetch_source() {
 }
 
 build() {
-	BUILDDIR="${TOOL_DIR}/${TOOL}/build"
 	COPYLIST="list_dpkg_output"
 	[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
 
         list_packet_files >> "${COPYLIST}"
-	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${BUILDDIR}"
+	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
 	
 }
 post_copy() {
diff --git a/remote/tools/consolekit/consolekit.conf b/remote/modules/consolekit/consolekit.conf
index 38f1718f..38f1718f 100644
--- a/remote/tools/consolekit/consolekit.conf
+++ b/remote/modules/consolekit/consolekit.conf
diff --git a/remote/tools/dbus/dbus.build b/remote/modules/dbus/dbus.build
index 2c0e3866..31c75fc9 100644
--- a/remote/tools/dbus/dbus.build
+++ b/remote/modules/dbus/dbus.build
@@ -5,12 +5,11 @@ fetch_source() {
 }
 
 build() {
-	BUILDDIR="${TOOL_DIR}/${TOOL}/build"
 	COPYLIST="list_dpkg_output"
 	[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
 
         list_packet_files >> "${COPYLIST}"
-	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${BUILDDIR}"
+	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
 
 }
 post_copy() {
diff --git a/remote/tools/dbus/dbus.conf b/remote/modules/dbus/dbus.conf
index a8c97d9c..a8c97d9c 100644
--- a/remote/tools/dbus/dbus.conf
+++ b/remote/modules/dbus/dbus.conf
diff --git a/remote/tools/dbus/dbus.conf.zypper b/remote/modules/dbus/dbus.conf.zypper
index db7183c5..db7183c5 100644
--- a/remote/tools/dbus/dbus.conf.zypper
+++ b/remote/modules/dbus/dbus.conf.zypper
diff --git a/remote/tools/kdm/data/etc/kde4/kdm/kdmrc b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
index 88f478ea..88f478ea 100644
--- a/remote/tools/kdm/data/etc/kde4/kdm/kdmrc
+++ b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
diff --git a/remote/tools/kdm/data/etc/systemd/system/display-manager.service b/remote/modules/kdm/data/etc/systemd/system/display-manager.service
index 640910e3..640910e3 120000
--- a/remote/tools/kdm/data/etc/systemd/system/display-manager.service
+++ b/remote/modules/kdm/data/etc/systemd/system/display-manager.service
diff --git a/remote/tools/kdm/data/etc/systemd/system/kdm.service b/remote/modules/kdm/data/etc/systemd/system/kdm.service
index 14ff7457..14ff7457 100644
--- a/remote/tools/kdm/data/etc/systemd/system/kdm.service
+++ b/remote/modules/kdm/data/etc/systemd/system/kdm.service
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/KdmGreeterTheme.desktop b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/KdmGreeterTheme.desktop
index 36242be4..36242be4 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/KdmGreeterTheme.desktop
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/KdmGreeterTheme.desktop
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/color.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/color.png
index c2e998e5..c2e998e5 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/color.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/color.png
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/enter.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter.png
index b646e851..b646e851 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/enter.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter.png
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/enter_inactive.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter_inactive.png
index e12cfb8e..e12cfb8e 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/enter_inactive.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter_inactive.png
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/environment.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/environment.png
index b9682822..b9682822 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/environment.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/environment.png
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/main-runner.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/main-runner.png
index fde2787d..fde2787d 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/main-runner.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/main-runner.png
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/rz-logo.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/rz-logo.png
index d48b2b63..d48b2b63 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/rz-logo.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/rz-logo.png
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/sessions.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions.png
index 00d05f29..00d05f29 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/sessions.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions.png
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/sessions_inactive.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions_inactive.png
index 86bbe642..86bbe642 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/sessions_inactive.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions_inactive.png
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/system.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system.png
index f7b9e71f..f7b9e71f 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/system.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system.png
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/system_inactive.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system_inactive.png
index c3e1719b..c3e1719b 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/system_inactive.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system_inactive.png
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/theme.xml b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/theme.xml
index ab64ecfb..ab64ecfb 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/theme.xml
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/theme.xml
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/uni-logo.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/uni-logo.png
index 45cef30e..45cef30e 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/uni-logo.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/uni-logo.png
diff --git a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/welcome-time-shadowed.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/welcome-time-shadowed.png
index f9f34c5c..f9f34c5c 100644
--- a/remote/tools/kdm/data/usr/share/desktop/themes/kdm/uni/welcome-time-shadowed.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/welcome-time-shadowed.png
diff --git a/remote/tools/kdm/data/usr/share/xsessions/default.desktop b/remote/modules/kdm/data/usr/share/xsessions/default.desktop
index c6a0f825..c6a0f825 100755
--- a/remote/tools/kdm/data/usr/share/xsessions/default.desktop
+++ b/remote/modules/kdm/data/usr/share/xsessions/default.desktop
diff --git a/remote/tools/kdm/kdm.build b/remote/modules/kdm/kdm.build
index 5e0618eb..88c47f6b 100644
--- a/remote/tools/kdm/kdm.build
+++ b/remote/modules/kdm/kdm.build
@@ -6,17 +6,16 @@ fetch_source () {
 }	
 
 build () {
-        BUILDDIR="${TOOL_DIR}/${TOOL}/build"
         COPYLIST="list_dpkg_output"
         [ -e "${COPYLIST}" ] && rm "${COPYLIST}"
 
         list_packet_files >> "${COPYLIST}"
-        tarcopy "$(cat "${COPYLIST}" | sort -u)" "${BUILDDIR}"
+        tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
 }
 
 post_copy() {
         # copy static kdm files to stage3.2
-        cp -r ${TOOL_DIR}/${TOOL}/data/* ${TARGET_BUILD_DIR}
+        cp -r ${MODULE_DIR}/data/* ${TARGET_BUILD_DIR}
 	#create static kdm folders in stage3.2
 	mkdir -p ${TARGET_BUILD_DIR}/var/lib/kdm
 	mkdir -p ${TARGET_BUILD_DIR}/var/run/kdm 
diff --git a/remote/tools/kdm/kdm.conf b/remote/modules/kdm/kdm.conf
index 85f4ae66..85f4ae66 100644
--- a/remote/tools/kdm/kdm.conf
+++ b/remote/modules/kdm/kdm.conf
diff --git a/remote/tools/ldm-gtk-greeter/data/etc/fonts/fonts.conf b/remote/modules/ldm-gtk-greeter/data/etc/fonts/fonts.conf
index 5eb6afe1..5eb6afe1 100644
--- a/remote/tools/ldm-gtk-greeter/data/etc/fonts/fonts.conf
+++ b/remote/modules/ldm-gtk-greeter/data/etc/fonts/fonts.conf
diff --git a/remote/tools/ldm-gtk-greeter/data/etc/lightdm/lightdm-gtk-greeter.conf b/remote/modules/ldm-gtk-greeter/data/etc/lightdm/lightdm-gtk-greeter.conf
index 50e5700b..50e5700b 100644
--- a/remote/tools/ldm-gtk-greeter/data/etc/lightdm/lightdm-gtk-greeter.conf
+++ b/remote/modules/ldm-gtk-greeter/data/etc/lightdm/lightdm-gtk-greeter.conf
diff --git a/remote/tools/ldm-gtk-greeter/data/etc/lightdm/lightdm.conf b/remote/modules/ldm-gtk-greeter/data/etc/lightdm/lightdm.conf
index 6cb2090c..6cb2090c 100644
--- a/remote/tools/ldm-gtk-greeter/data/etc/lightdm/lightdm.conf
+++ b/remote/modules/ldm-gtk-greeter/data/etc/lightdm/lightdm.conf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/backgrounds/warty-final-ubuntu.png b/remote/modules/ldm-gtk-greeter/data/usr/share/backgrounds/warty-final-ubuntu.png
index b9e7b65a..b9e7b65a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/backgrounds/warty-final-ubuntu.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/backgrounds/warty-final-ubuntu.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf
index c0142fea..c0142fea 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-BI.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-BI.ttf
index 12e4c7df..12e4c7df 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-BI.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-BI.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-C.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-C.ttf
index 8d3e8676..8d3e8676 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-C.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-C.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-L.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-L.ttf
index 7b7ac7dd..7b7ac7dd 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-L.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-L.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-LI.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-LI.ttf
index e36de452..e36de452 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-LI.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-LI.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf
index 45a038ba..45a038ba 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-RI.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-RI.ttf
index 6f819f69..6f819f69 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-RI.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-RI.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-B.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-B.ttf
index 7bd66657..7bd66657 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-B.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-B.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-BI.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-BI.ttf
index 6c5b8ba0..6c5b8ba0 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-BI.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-BI.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-R.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-R.ttf
index fdd309d7..fdd309d7 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-R.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-R.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-RI.ttf b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-RI.ttf
index 18f81a29..18f81a29 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-RI.ttf
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/fonts/truetype/ubuntu-font-family/UbuntuMono-RI.ttf
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/48x48/devices/computer.png b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/48x48/devices/computer.png
index de87c0b0..de87c0b0 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/48x48/devices/computer.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/48x48/devices/computer.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/index.theme b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/index.theme
index 1c812195..1c812195 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/index.theme
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/index.theme
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/accessibility.svg b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/accessibility.svg
index d6347d3c..d6347d3c 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/accessibility.svg
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/accessibility.svg
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/system-shutdown.svg b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/system-shutdown.svg
index e7882163..e7882163 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/system-shutdown.svg
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/icons/hicolor/scalable/apps/system-shutdown.svg
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/banshee.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/banshee.rc
index d49aaf7d..d49aaf7d 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/banshee.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/banshee.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/chromium.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/chromium.rc
index ededd768..ededd768 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/chromium.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/chromium.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ff.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ff.rc
index 3f08b2e7..3f08b2e7 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ff.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ff.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gedit.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gedit.rc
index 7455cb7c..7455cb7c 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gedit.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gedit.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-panel.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-panel.rc
index 4478befd..4478befd 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-panel.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-panel.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-terminal.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-terminal.rc
index 403991d8..403991d8 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-terminal.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/gnome-terminal.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/arrow-down.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/arrow-down.png
index 459c8016..459c8016 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/arrow-down.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/arrow-down.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-h.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-h.png
index fa6c44fb..fa6c44fb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-h.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-h.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-v.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-v.png
index fa6c44fb..fa6c44fb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-v.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/handle-v.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-normal.png
index 1766ef39..1766ef39 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-prelight.png
index 3e8b9740..3e8b9740 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-pressed.png
index 2fe0720a..2fe0720a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-center-pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-normal.png
index e20f66b9..e20f66b9 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-prelight.png
index fa7f3cf1..fa7f3cf1 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-pressed.png
index fa68e6ba..fa68e6ba 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-left-pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-normal.png
index d46ec888..d46ec888 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-prelight.png
index d6aea289..d6aea289 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-pressed.png
index 7fbcc146..7fbcc146 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/mode-right-pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-active.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-active.png
index 8810e14f..8810e14f 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-active.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-active.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-hover.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-hover.png
index b309d8db..b309d8db 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-hover.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-hover.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-inactive.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-inactive.png
index df63d807..df63d807 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-inactive.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel-button-inactive.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel.png
index eea4adc7..eea4adc7 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/nautilus.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/nautilus.rc
index 1f5fd663..1f5fd663 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/nautilus.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/nautilus.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ubuntuone.rc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ubuntuone.rc
index 177b3bf8..177b3bf8 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ubuntuone.rc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/apps/ubuntuone.rc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/gtkrc b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/gtkrc
index dc7d7798..dc7d7798 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/gtkrc
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-2.0/gtkrc
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-panel.css b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-panel.css
index 37da3e12..37da3e12 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-panel.css
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-panel.css
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-terminal.css b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-terminal.css
index 9efad7f3..9efad7f3 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-terminal.css
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/gnome-terminal.css
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/nautilus.css b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/nautilus.css
index 4b765831..4b765831 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/nautilus.css
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/nautilus.css
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/unity.css b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/unity.css
index 3cfc7dcb..3cfc7dcb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/unity.css
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/apps/unity.css
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle.png
index c8019d19..c8019d19 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle_vertical.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle_vertical.png
index 69642719..69642719 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle_vertical.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/scrollbar_handle_vertical.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider.png
index dcb07eba..dcb07eba 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight.png
index 048d8b41..048d8b41 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight_vertical.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight_vertical.png
index eea519f6..eea519f6 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight_vertical.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_prelight_vertical.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_vertical.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_vertical.png
index 6a9d409a..6a9d409a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_vertical.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/assets/slider_vertical.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk-widgets.css b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk-widgets.css
index 1daf4833..1daf4833 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk-widgets.css
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk-widgets.css
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk.css b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk.css
index 8c28389c..8c28389c 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk.css
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/gtk.css
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/settings.ini b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/settings.ini
index ab8f3b00..ab8f3b00 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/settings.ini
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/gtk-3.0/settings.ini
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/index.theme b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/index.theme
index 105dee69..105dee69 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/index.theme
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/index.theme
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close.png
index 9ef84eaf..9ef84eaf 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_normal.png
index 9ef84eaf..9ef84eaf 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_prelight.png
index 9e09161a..9e09161a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_pressed.png
index 04431b94..04431b94 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused.png
index 9be481d6..9be481d6 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_over.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_over.png
index 63004d48..63004d48 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_over.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_over.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_prelight.png
index 6732780f..6732780f 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_pressed.png
index c5f120f3..c5f120f3 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/close_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize.png
index d3833110..d3833110 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_normal.png
index d3833110..d3833110 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_prelight.png
index fc97526f..fc97526f 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_pressed.png
index 2e667f27..2e667f27 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused.png
index 6a9fd7fe..6a9fd7fe 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_over.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_over.png
index 274c1831..274c1831 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_over.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_over.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_prelight.png
index fc97526f..fc97526f 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_pressed.png
index 378d4a77..378d4a77 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/maximize_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu.png
index 7d2fff78..7d2fff78 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu_prelight.png
index efd98ccd..efd98ccd 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/menu_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/metacity-theme-1.xml b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/metacity-theme-1.xml
index cb2cb5f3..cb2cb5f3 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/metacity-theme-1.xml
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/metacity-theme-1.xml
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize.png
index c15844e3..c15844e3 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_normal.png
index c15844e3..c15844e3 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_prelight.png
index 96c0492a..96c0492a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_pressed.png
index c8b69ee2..c8b69ee2 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused.png
index a1f34902..a1f34902 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_over.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_over.png
index ab03287b..ab03287b 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_over.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_over.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_prelight.png
index 96c0492a..96c0492a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_pressed.png
index c8b69ee2..c8b69ee2 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/minimize_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_left.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_left.png
index 0c462416..0c462416 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_left.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_left.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_middle.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_middle.png
index bbb3a0c4..bbb3a0c4 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_middle.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_middle.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_right.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_right.png
index 90bca45b..90bca45b 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_right.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/trough_right.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize.png
index 44170155..44170155 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_normal.png
index 44170155..44170155 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_prelight.png
index 2d79bf56..2d79bf56 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_pressed.png
index dff681fc..dff681fc 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused.png
index f2c85846..f2c85846 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_over.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_over.png
index a5c7093a..a5c7093a 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_over.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_over.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_prelight.png
index 2d79bf56..2d79bf56 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_pressed.png
index dff681fc..dff681fc 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/metacity-1/unmaximize_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close.png
index 72e3b9cb..72e3b9cb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_normal.png
index 72e3b9cb..72e3b9cb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_prelight.png
index 5768c54c..5768c54c 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_pressed.png
index 590a7c31..590a7c31 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused.png
index 03eb5a69..03eb5a69 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_prelight.png
index 6e5ec3d9..6e5ec3d9 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_pressed.png
index d8c52f10..d8c52f10 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/close_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize.png
index ae1d896b..ae1d896b 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_normal.png
index ae1d896b..ae1d896b 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_prelight.png
index af33732b..af33732b 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_pressed.png
index 4e07a0cb..4e07a0cb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused.png
index 7a67f2fe..7a67f2fe 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_prelight.png
index 3601d729..3601d729 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_pressed.png
index c70e49bb..c70e49bb 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/maximize_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize.png
index c5d7d21c..c5d7d21c 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_normal.png
index c5d7d21c..c5d7d21c 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_prelight.png
index 6aa77c07..6aa77c07 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_pressed.png
index 13b1b064..13b1b064 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused.png
index ab9cfa82..ab9cfa82 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_prelight.png
index 6aa77c07..6aa77c07 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_pressed.png
index 13b1b064..13b1b064 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/minimize_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize.png
index 45e915ef..45e915ef 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_normal.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_normal.png
index 45e915ef..45e915ef 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_normal.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_normal.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_prelight.png
index 8c9d888f..8c9d888f 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_pressed.png
index 240b9249..240b9249 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_focused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused.png
index d06a8452..d06a8452 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_prelight.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_prelight.png
index 8c9d888f..8c9d888f 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_prelight.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_prelight.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_pressed.png b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_pressed.png
index 240b9249..240b9249 100644
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_pressed.png
+++ b/remote/modules/ldm-gtk-greeter/data/usr/share/themes/Ambiance/unity/unmaximize_unfocused_pressed.png
diff --git a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build
index 87154e3e..19adf66a 100644
--- a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build
+++ b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build
@@ -6,8 +6,6 @@ fetch_source () {
 }	
 
 build () {
-	BUILDDIR="$TOOL_DIR/$TOOL/build"
-
 	if [ ! -e .built ]; then
 		cd "src/$VERSION"
 		pinfo "Running configure"
@@ -15,13 +13,13 @@ build () {
 		pinfo "Running make"
 		make || perror "failed."
 		pinfo "Running make install"
-		DESTDIR="$BUILDDIR" make install || perror "failed."
+		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "failed."
 		
 		COPYLIST="list_dpkg_output"
 		[ -e "$COPYLIST" ] && rm "$COPYLIST"
 
 		list_packet_files >> "$COPYLIST"
-		tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR"
+		tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
 
 		cd -
 		touch .built
@@ -31,7 +29,7 @@ build () {
 
 post_copy() {
 	#copy static data files
-	cp -r "${TOOL_DIR}/${TOOL}/data/"* "${TARGET_BUILD_DIR}" || perror "Copying data/* failed."
+	cp -r "${MODULE_DIR}/data/"* "${TARGET_BUILD_DIR}" || perror "Copying data/* failed."
 	# TODO: FIX PATH TO TRIPLET...
 	TRIPLET="$(basename "$(dirname "$(ldd "$SHELL" | grep libc | awk -F " " '{print $3}')")")"
 	gdk-pixbuf-query-loaders > "${TARGET_BUILD_DIR}/usr/lib/${TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders.cache" || perror "pixbuf-query-loaders failed."
diff --git a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.conf
index 58d189b7..58d189b7 100644
--- a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf
+++ b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.conf
diff --git a/remote/tools/ldm/data/etc/systemd/system/graphical.target.wants/lightdm.service b/remote/modules/ldm/data/etc/systemd/system/graphical.target.wants/lightdm.service
index c7aaa65a..c7aaa65a 120000
--- a/remote/tools/ldm/data/etc/systemd/system/graphical.target.wants/lightdm.service
+++ b/remote/modules/ldm/data/etc/systemd/system/graphical.target.wants/lightdm.service
diff --git a/remote/tools/ldm/data/etc/systemd/system/lightdm.service b/remote/modules/ldm/data/etc/systemd/system/lightdm.service
index 99911bff..99911bff 100644
--- a/remote/tools/ldm/data/etc/systemd/system/lightdm.service
+++ b/remote/modules/ldm/data/etc/systemd/system/lightdm.service
diff --git a/remote/tools/ldm/ldm.build b/remote/modules/ldm/ldm.build
index 9aaad683..88429cff 100644
--- a/remote/tools/ldm/ldm.build
+++ b/remote/modules/ldm/ldm.build
@@ -6,7 +6,6 @@ fetch_source () {
 }	
 
 build () {
-	BUILDDIR="$TOOL_DIR/$TOOL/build"
 	if [ ! -e .built ]; then
 		cd "src/$VERSION"
 		pinfo "Running configure"
@@ -14,14 +13,14 @@ build () {
 		pinfo "Running make"
 		make || perror "failed."
 		pinfo "Running make install"
-		DESTDIR="$BUILDDIR" make install || perror "failed."
+		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "failed."
 		
 		COPYLIST="list_dpkg_output"
 
 		[ -e "$COPYLIST" ] && rm "$COPYLIST"
 
 		list_packet_files >> "$COPYLIST"
-		tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR"
+		tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
 
 		cd -
 		touch .built
@@ -36,7 +35,7 @@ post_copy() {
 	pinfo "lightdm user and group is $LDMUID $LDMGID"
 	chown -R "${LDMUID}:${LDMGID}" "${TARGET_BUILD_DIR}/var/lib/lightdm/" || perror "chowning '${TARGET_BUILD_DIR}/var/lib/lightdm/' failed."
 	#copyi static data files
-	cp -r "${TOOL_DIR}/${TOOL}/data/"* "${TARGET_BUILD_DIR}" || perror "Copying data/ failed."
+	cp -r "${MODULE_DIR}/data/"* "${TARGET_BUILD_DIR}" || perror "Copying data/ failed."
 
 }
 
diff --git a/remote/tools/ldm/ldm.conf b/remote/modules/ldm/ldm.conf
index d40aab7f..d40aab7f 100644
--- a/remote/tools/ldm/ldm.conf
+++ b/remote/modules/ldm/ldm.conf
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-halt.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-halt.service
index d01ba9b8..d01ba9b8 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-halt.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-halt.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-kexec.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-kexec.service
index 1fe6e47f..1fe6e47f 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-kexec.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-kexec.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-poweroff.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-poweroff.service
index 49742f6e..49742f6e 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-poweroff.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-poweroff.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-quit-wait.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit-wait.service
index 56af45a7..56af45a7 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-quit-wait.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit-wait.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-quit.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit.service
index be3c1888..be3c1888 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-quit.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-read-write.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-read-write.service
index caa3973b..caa3973b 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-read-write.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-read-write.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-reboot.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-reboot.service
index dbedd00d..dbedd00d 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-reboot.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-reboot.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/plymouth-start.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-start.service
index 09243001..09243001 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/plymouth-start.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/plymouth-start.service
diff --git a/remote/tools/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.path b/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.path
index c2ee4206..c2ee4206 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.path
+++ b/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.path
diff --git a/remote/tools/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.service b/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.service
index aa9ffc21..aa9ffc21 100644
--- a/remote/tools/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.service
+++ b/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.service
diff --git a/remote/tools/plymouth/data/lib/plymouth/themes/default.plymouth b/remote/modules/plymouth/data/lib/plymouth/themes/default.plymouth
index bc669108..bc669108 100644
--- a/remote/tools/plymouth/data/lib/plymouth/themes/default.plymouth
+++ b/remote/modules/plymouth/data/lib/plymouth/themes/default.plymouth
diff --git a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png
index 9cb68040..9cb68040 100644
--- a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png
+++ b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png
diff --git a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png
index 16b069cc..16b069cc 100644
--- a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png
+++ b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png
diff --git a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth
index 0f300f6b..0f300f6b 100644
--- a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth
+++ b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth
diff --git a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script
index f2d8bd28..f2d8bd28 100644
--- a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script
+++ b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script
diff --git a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png
index 4fd4be30..4fd4be30 100644
--- a/remote/tools/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png
+++ b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png
diff --git a/remote/tools/plymouth/plymouth.build b/remote/modules/plymouth/plymouth.build
index f13a1cfc..4363e809 100644
--- a/remote/tools/plymouth/plymouth.build
+++ b/remote/modules/plymouth/plymouth.build
@@ -7,14 +7,13 @@ fetch_source() {
 
 build() {
 	if [ ! -e .built ]; then
-		BUILDDIR=$TOOL_DIR/$TOOL/build
 		cd src/$VERSION
 		pinfo "Running configure" 
-		./configure --enable-systemd-integration --disable-gtk --disable-static --prefix="" || perror "failed."
+		./configure --enable-systemd-integration --disable-gtk --disable-static --prefix=""|| perror "failed."
 		pinfo "Running make"
 		make -j5 || perror "failed"
 		pinfo "Running make install" 
-		DESTDIR=$BUILDDIR make install || perror "failed"
+		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "failed"
 		cd -
 		touch .built
 	fi
@@ -24,5 +23,5 @@ post_copy() {
         # copy static dbus systemd unit files to stage3.2
         SYSTEMDDIR=${TARGET_BUILD_DIR}/etc/systemd/system
         [ ! -d ${SYSTEMDDIR} ] && mkdir -p ${SYSTEMDDIR}
-        cp -r ${TOOL_DIR}/${TOOL}/data/* ${TARGET_BUILD_DIR}
+        cp -r ${MODULE_DIR}/data/* ${TARGET_BUILD_DIR}
 }
diff --git a/remote/tools/plymouth/plymouth.conf b/remote/modules/plymouth/plymouth.conf
index 026aff9c..026aff9c 100644
--- a/remote/tools/plymouth/plymouth.conf
+++ b/remote/modules/plymouth/plymouth.conf
diff --git a/remote/tools/policykit-src/policykit.build b/remote/modules/policykit-src/policykit.build
index 72d7f246..811d9b0c 100644
--- a/remote/tools/policykit-src/policykit.build
+++ b/remote/modules/policykit-src/policykit.build
@@ -7,31 +7,29 @@ fetch_source () {
 }	
 
 build () {
-	BUILDDIR=$TOOL_DIR/$TOOL/build
-
 	if [ ! -e .built ]; then
 		cd src/$VERSION
 
-		[ ! -d "${TOOL_DIR}/systemd/build" ] && perror "systemd build directory not found. Build it first."
+		[ ! -d "${MODULES_DIR}/systemd/build" ] && perror "systemd build directory not found. Build it first."
+		SYSTEMD_BUILD_DIR="${MODULES_DIR}/systemd/build"
 		pinfo "configuring..."
-		LIBSYSTEMD_LOGIN_LIBS="-L${TOOL_DIR}/systemd/build/usr/lib/" \
-			LIBSYSTEMD_LOGIN_CFLAGS="-I${TOOL_DIR}/systemd/build/usr/include -I${TOOL_DIR}/systemd/build/usr/include/systemd -lsystemd-login -lsystemd-daemon" \
+		LIBSYSTEMD_LOGIN_LIBS="-L${SYSTEMD_BUILD_DIR}/usr/lib/" \
+			LIBSYSTEMD_LOGIN_CFLAGS="-I${SYSTEMD_BUILD_DIR}/usr/include -I${SYSTEMD_BUILD_DIR}/usr/include/systemd -lsystemd-login -lsystemd-daemon" \
 			./configure --enable-libsystemd-login=yes --with-systemdsystemunitdir=/etc/systemd/system -prefix="/" --datarootdir="/usr/share" --enable-man-pages=no --enable-gtk-doc-html=no --enable-examples=no --enable-static=no
 		pinfo "calling make..."
 		make || perror "make failed."
-		[ ! -d "$BUILDDIR" ] && mkdir -p "$BUILDDIR"
-		pinfo "installing to $BUILDDIR..."
-		DESTDIR="$BUILDDIR" make install || perror "make install failed..."
+		[ ! -d "${MODULE_BUILD_DIR}" ] && mkdir -p "${MODULE_BUILD_DIR}"
+		pinfo "installing to ${MODULE_BUILD_DIR}..."
+		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed..."
 		
 		COPYLIST="list_dpkg_output"
 		[ -e "$COPYLIST" ] && rm "$COPYLIST"
 
 		list_packet_files >> "$COPYLIST"
-		tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR"
+		tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
 
 		cd -
 		touch .built
-
 	fi
 }
 
diff --git a/remote/tools/policykit-src/policykit.conf b/remote/modules/policykit-src/policykit.conf
index 73b04015..73b04015 100644
--- a/remote/tools/policykit-src/policykit.conf
+++ b/remote/modules/policykit-src/policykit.conf
diff --git a/remote/tools/policykit/data/lib/systemd/system/polkitd.service b/remote/modules/policykit/data/lib/systemd/system/polkitd.service
index d3f192d1..d3f192d1 100644
--- a/remote/tools/policykit/data/lib/systemd/system/polkitd.service
+++ b/remote/modules/policykit/data/lib/systemd/system/polkitd.service
diff --git a/remote/tools/policykit/policykit.build b/remote/modules/policykit/policykit.build
index 8d27edcb..6a03b81c 100644
--- a/remote/tools/policykit/policykit.build
+++ b/remote/modules/policykit/policykit.build
@@ -6,18 +6,17 @@ fetch_source () {
 }	
 
 build () {
-        BUILDDIR="${TOOL_DIR}/${TOOL}/build"
         COPYLIST="list_dpkg_output"
         [ -e "${COPYLIST}" ] && rm "${COPYLIST}"
 
         list_packet_files >> "${COPYLIST}"
-        tarcopy "$(cat "${COPYLIST}" | sort -u)" "${BUILDDIR}"
+        tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
 }
 
 post_copy() {
 
 	# copy static policykit files to stage3.2
-        cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR}
+        cp -r ${MODULE_BUILD_DIR}/data/* ${TARGET_BUILD_DIR}
 	
 	#Add Polkit User/Group/Shadow to Stage3.2
 	pinfo "Adding polkitd user to target system..."
diff --git a/remote/tools/policykit/policykit.conf b/remote/modules/policykit/policykit.conf
index 3dcfd8d9..3dcfd8d9 100644
--- a/remote/tools/policykit/policykit.conf
+++ b/remote/modules/policykit/policykit.conf
diff --git a/remote/tools/rsyslogd/rsyslogd.build b/remote/modules/rsyslogd/rsyslogd.build
index 28a3bbfa..43aa112d 100644
--- a/remote/tools/rsyslogd/rsyslogd.build
+++ b/remote/modules/rsyslogd/rsyslogd.build
@@ -4,11 +4,7 @@ fetch_source() {
 
 build() {
 
-	BUILDDIR=${TOOL_DIR}/${TOOL}/build
-        mkdir -p "${BUILDDIR}"
-
 	FILELIST="list_binaries_and_files"
-
 	BIN_LOCATION=$(which rsyslogd)
 	if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
 	then
@@ -22,7 +18,7 @@ build() {
 		get_link_chain "${ENTRY}" >> "${FILELIST}"
 	done
 	
-	tarcopy "$(cat ${FILELIST}|sort -u)" "${BUILDDIR}"
+	tarcopy "$(cat ${FILELIST}|sort -u)" "${MODULE_BUILD_DIR}"
 
 }
 
diff --git a/remote/tools/rsyslogd/rsyslogd.conf b/remote/modules/rsyslogd/rsyslogd.conf
index 20b5df1b..20b5df1b 100644
--- a/remote/tools/rsyslogd/rsyslogd.conf
+++ b/remote/modules/rsyslogd/rsyslogd.conf
diff --git a/remote/tools/sshd/data/etc/issue.net b/remote/modules/sshd/data/etc/issue.net
index 7dfbddb5..7dfbddb5 100644
--- a/remote/tools/sshd/data/etc/issue.net
+++ b/remote/modules/sshd/data/etc/issue.net
diff --git a/remote/tools/sshd/data/etc/ssh/ssh_host_dsa_key b/remote/modules/sshd/data/etc/ssh/ssh_host_dsa_key
index 0132fe84..0132fe84 100644
--- a/remote/tools/sshd/data/etc/ssh/ssh_host_dsa_key
+++ b/remote/modules/sshd/data/etc/ssh/ssh_host_dsa_key
diff --git a/remote/tools/sshd/data/etc/ssh/ssh_host_dsa_key.pub b/remote/modules/sshd/data/etc/ssh/ssh_host_dsa_key.pub
index 97af5cb0..97af5cb0 100644
--- a/remote/tools/sshd/data/etc/ssh/ssh_host_dsa_key.pub
+++ b/remote/modules/sshd/data/etc/ssh/ssh_host_dsa_key.pub
diff --git a/remote/tools/sshd/data/etc/ssh/ssh_host_ecdsa_key b/remote/modules/sshd/data/etc/ssh/ssh_host_ecdsa_key
index 1fea2717..1fea2717 100644
--- a/remote/tools/sshd/data/etc/ssh/ssh_host_ecdsa_key
+++ b/remote/modules/sshd/data/etc/ssh/ssh_host_ecdsa_key
diff --git a/remote/tools/sshd/data/etc/ssh/ssh_host_ecdsa_key.pub b/remote/modules/sshd/data/etc/ssh/ssh_host_ecdsa_key.pub
index 0ef413ba..0ef413ba 100644
--- a/remote/tools/sshd/data/etc/ssh/ssh_host_ecdsa_key.pub
+++ b/remote/modules/sshd/data/etc/ssh/ssh_host_ecdsa_key.pub
diff --git a/remote/tools/sshd/data/etc/ssh/ssh_host_rsa_key b/remote/modules/sshd/data/etc/ssh/ssh_host_rsa_key
index b37b5a74..b37b5a74 100644
--- a/remote/tools/sshd/data/etc/ssh/ssh_host_rsa_key
+++ b/remote/modules/sshd/data/etc/ssh/ssh_host_rsa_key
diff --git a/remote/tools/sshd/data/etc/ssh/ssh_host_rsa_key.pub b/remote/modules/sshd/data/etc/ssh/ssh_host_rsa_key.pub
index e6fd0588..e6fd0588 100644
--- a/remote/tools/sshd/data/etc/ssh/ssh_host_rsa_key.pub
+++ b/remote/modules/sshd/data/etc/ssh/ssh_host_rsa_key.pub
diff --git a/remote/tools/sshd/data/etc/ssh/sshd_config b/remote/modules/sshd/data/etc/ssh/sshd_config
index da9e5e01..da9e5e01 100644
--- a/remote/tools/sshd/data/etc/ssh/sshd_config
+++ b/remote/modules/sshd/data/etc/ssh/sshd_config
diff --git a/remote/tools/sshd/data/etc/systemd/system/sshd.service b/remote/modules/sshd/data/etc/systemd/system/sshd.service
index fc711808..fc711808 100644
--- a/remote/tools/sshd/data/etc/systemd/system/sshd.service
+++ b/remote/modules/sshd/data/etc/systemd/system/sshd.service
diff --git a/remote/modules/sshd/sshd.build b/remote/modules/sshd/sshd.build
new file mode 100644
index 00000000..57a9e35d
--- /dev/null
+++ b/remote/modules/sshd/sshd.build
@@ -0,0 +1,19 @@
+fetch_source() {
+	:
+}
+
+build() {
+
+	BIN_LOCATION=$(which sshd)
+	[ ! -z ${BIN_LOCATION} ] && BIN_LOCATION=$(readlink -f "$BIN_LOCATION")
+	if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ]; then
+		tarcopy "${BIN_LOCATION}" "${MODULE_BUILD_DIR}"
+	else
+		perror "'sshd' not found on the system! Please install it."
+	fi
+}
+
+post_copy() {	
+	mkdir -p "${TARGET_BUILD_DIR}/var/run/sshd"
+	cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}"
+}
diff --git a/remote/tools/sshd/sshd.conf b/remote/modules/sshd/sshd.conf
index 25793c72..25793c72 100644
--- a/remote/tools/sshd/sshd.conf
+++ b/remote/modules/sshd/sshd.conf
diff --git a/remote/tools/systemd/data/etc/systemd/system/activate-swap b/remote/modules/systemd/data/etc/systemd/system/activate-swap
index 10cb42e9..10cb42e9 100644
--- a/remote/tools/systemd/data/etc/systemd/system/activate-swap
+++ b/remote/modules/systemd/data/etc/systemd/system/activate-swap
diff --git a/remote/tools/systemd/data/etc/systemd/system/analyse-disk.sh b/remote/modules/systemd/data/etc/systemd/system/analyse-disk.sh
index 0c152dbf..0c152dbf 100644
--- a/remote/tools/systemd/data/etc/systemd/system/analyse-disk.sh
+++ b/remote/modules/systemd/data/etc/systemd/system/analyse-disk.sh
diff --git a/remote/tools/systemd/data/etc/systemd/system/debug-shell.service b/remote/modules/systemd/data/etc/systemd/system/debug-shell.service
index 063d4995..063d4995 100644
--- a/remote/tools/systemd/data/etc/systemd/system/debug-shell.service
+++ b/remote/modules/systemd/data/etc/systemd/system/debug-shell.service
diff --git a/remote/tools/systemd/data/etc/systemd/system/fetch-config b/remote/modules/systemd/data/etc/systemd/system/fetch-config
index 556f0f41..556f0f41 100644
--- a/remote/tools/systemd/data/etc/systemd/system/fetch-config
+++ b/remote/modules/systemd/data/etc/systemd/system/fetch-config
diff --git a/remote/tools/systemd/data/etc/systemd/system/getty.target.wants/load-german-keymap.service b/remote/modules/systemd/data/etc/systemd/system/getty.target.wants/load-german-keymap.service
index d329f45a..d329f45a 120000
--- a/remote/tools/systemd/data/etc/systemd/system/getty.target.wants/load-german-keymap.service
+++ b/remote/modules/systemd/data/etc/systemd/system/getty.target.wants/load-german-keymap.service
diff --git a/remote/tools/systemd/data/etc/systemd/system/ip-dns-conf b/remote/modules/systemd/data/etc/systemd/system/ip-dns-conf
index f14ecd88..f14ecd88 100644
--- a/remote/tools/systemd/data/etc/systemd/system/ip-dns-conf
+++ b/remote/modules/systemd/data/etc/systemd/system/ip-dns-conf
diff --git a/remote/tools/systemd/data/etc/systemd/system/load-german-keymap.service b/remote/modules/systemd/data/etc/systemd/system/load-german-keymap.service
index 74753259..74753259 100644
--- a/remote/tools/systemd/data/etc/systemd/system/load-german-keymap.service
+++ b/remote/modules/systemd/data/etc/systemd/system/load-german-keymap.service
diff --git a/remote/tools/systemd/data/etc/systemd/system/network-interface@.service b/remote/modules/systemd/data/etc/systemd/system/network-interface@.service
index 137b3af6..137b3af6 100644
--- a/remote/tools/systemd/data/etc/systemd/system/network-interface@.service
+++ b/remote/modules/systemd/data/etc/systemd/system/network-interface@.service
diff --git a/remote/tools/systemd/data/etc/systemd/system/nfs-mount.service b/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service
index 727ff2ed..727ff2ed 100644
--- a/remote/tools/systemd/data/etc/systemd/system/nfs-mount.service
+++ b/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service
diff --git a/remote/tools/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service b/remote/modules/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service
index 699b56ac..699b56ac 120000
--- a/remote/tools/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service
+++ b/remote/modules/systemd/data/etc/systemd/system/sysinit.target.wants/debug-shell.service
diff --git a/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service
index e7d4d170..e7d4d170 100644
--- a/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service
+++ b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service
diff --git a/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules b/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
index 387a5754..387a5754 100644
--- a/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
+++ b/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
diff --git a/remote/tools/systemd/systemd.build b/remote/modules/systemd/systemd.build
index c0e40f9f..450e743b 100644
--- a/remote/tools/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -24,9 +24,8 @@ build () {
 		./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no || perror "configure failed."
 		pinfo "calling make"
 		make -j5 || perror "make failed."
-		mkdir -p $TOOL_DIR/$TOOL/build
 		pinfo "calling make install"
-		DESTDIR=$TOOL_DIR/$TOOL/build make install || perror "make install failed."
+		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed."
 		cd -
 		touch .built
 	fi
@@ -34,18 +33,18 @@ build () {
 
 post_copy() {
 	# copy static data files
-	cp -r $TOOL_DIR/$TOOL/data/* $TARGET_BUILD_DIR || perror "copying data files failed."
+	cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" || perror "copying data files failed."
 		
 	# dont clear systemd log at startup
-	sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" $TARGET_BUILD_DIR/usr/lib/systemd/system/getty@.service
+	sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
 
 	#old agetty version doesn't support --noclear option in getty service
 	if [ "x$(dpkg -s util-linux | grep Version: | cut -d' ' -f2)" == "x2.19.1-2ubuntu3" ];
 	then
-		sed -i.bak "s/ExecStart=-\/sbin\/agetty --noclear %I 38400 linux/ExecStart=-\/sbin\/agetty %I 38400 linux/g" $TARGET_BUILD_DIR/usr/lib/systemd/system/getty@.service
+		sed -i.bak "s/ExecStart=-\/sbin\/agetty --noclear %I 38400 linux/ExecStart=-\/sbin\/agetty %I 38400 linux/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
 	fi
 
 	# add nfs to modules-load list
-	echo "nfs" > "$TARGET_BUILD_DIR/etc/modules-load.d/nfs.conf"
+	echo "nfs" > "${TARGET_BUILD_DIR}/etc/modules-load.d/nfs.conf"
 }
 
diff --git a/remote/tools/systemd/systemd.conf b/remote/modules/systemd/systemd.conf
index c5e72aeb..c5e72aeb 100644
--- a/remote/tools/systemd/systemd.conf
+++ b/remote/modules/systemd/systemd.conf
diff --git a/remote/tools/vmchooser/data/etc/openslx/vmchooser/vmchooser.conf b/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser.conf
index 3dd30ebc..3dd30ebc 100644
--- a/remote/tools/vmchooser/data/etc/openslx/vmchooser/vmchooser.conf
+++ b/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser.conf
diff --git a/remote/tools/vmchooser/data/openslx/bin/run-virt.sh b/remote/modules/vmchooser/data/openslx/bin/run-virt.sh
index b3863a2e..b3863a2e 100755
--- a/remote/tools/vmchooser/data/openslx/bin/run-virt.sh
+++ b/remote/modules/vmchooser/data/openslx/bin/run-virt.sh
diff --git a/remote/tools/vmchooser/data/openslx/bin/vmchooser b/remote/modules/vmchooser/data/openslx/bin/vmchooser
index d8ec07f9..d8ec07f9 100755
--- a/remote/tools/vmchooser/data/openslx/bin/vmchooser
+++ b/remote/modules/vmchooser/data/openslx/bin/vmchooser
diff --git a/remote/tools/vmchooser/data/openslx/bin/xmlfilter.sh b/remote/modules/vmchooser/data/openslx/bin/xmlfilter.sh
index ded5d114..ded5d114 100755
--- a/remote/tools/vmchooser/data/openslx/bin/xmlfilter.sh
+++ b/remote/modules/vmchooser/data/openslx/bin/xmlfilter.sh
diff --git a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-left.png b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-left.png
index 900dd867..900dd867 100644
--- a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-left.png
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-left.png
diff --git a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-right.png b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-right.png
index 8ca9347b..8ca9347b 100644
--- a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-right.png
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-right.png
diff --git a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx.ini b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx.ini
index 57a22821..57a22821 100644
--- a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx.ini
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx.ini
diff --git a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/planets/planets-left.png b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-left.png
index c8736b72..c8736b72 100644
--- a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/planets/planets-left.png
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-left.png
diff --git a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/planets/planets-right.png b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-right.png
index e21f0d8b..e21f0d8b 100644
--- a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/planets/planets-right.png
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-right.png
diff --git a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/planets/planets.ini b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets.ini
index d9aa17f6..d9aa17f6 100644
--- a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/planets/planets.ini
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets.ini
diff --git a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/unifr/title_l.png b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_l.png
index e602ccd1..e602ccd1 100644
--- a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/unifr/title_l.png
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_l.png
diff --git a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/unifr/title_r.png b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_r.png
index 3edbcb0c..3edbcb0c 100644
--- a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/unifr/title_r.png
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_r.png
diff --git a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/unifr/unifr.ini b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/unifr.ini
index dadcb4e1..dadcb4e1 100644
--- a/remote/tools/vmchooser/data/usr/share/vmchooser/themes/unifr/unifr.ini
+++ b/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/unifr.ini
diff --git a/remote/tools/vmchooser/data/vmchooser/default.desktop b/remote/modules/vmchooser/data/vmchooser/default.desktop
index 91540228..91540228 100755
--- a/remote/tools/vmchooser/data/vmchooser/default.desktop
+++ b/remote/modules/vmchooser/data/vmchooser/default.desktop
diff --git a/remote/tools/vmchooser/data/vmchooser/mesgdisp b/remote/modules/vmchooser/data/vmchooser/mesgdisp
index 41e3721c..41e3721c 100755
--- a/remote/tools/vmchooser/data/vmchooser/mesgdisp
+++ b/remote/modules/vmchooser/data/vmchooser/mesgdisp
diff --git a/remote/tools/vmchooser/data/vmchooser/printer.sh b/remote/modules/vmchooser/data/vmchooser/printer.sh
index 8f1d5ffa..8f1d5ffa 100755
--- a/remote/tools/vmchooser/data/vmchooser/printer.sh
+++ b/remote/modules/vmchooser/data/vmchooser/printer.sh
diff --git a/remote/tools/vmchooser/data/vmchooser/scanner.sh b/remote/modules/vmchooser/data/vmchooser/scanner.sh
index dcb94c68..dcb94c68 100755
--- a/remote/tools/vmchooser/data/vmchooser/scanner.sh
+++ b/remote/modules/vmchooser/data/vmchooser/scanner.sh
diff --git a/remote/tools/vmchooser/data/vmchooser/smb.conf b/remote/modules/vmchooser/data/vmchooser/smb.conf
index ec757ce4..ec757ce4 100755
--- a/remote/tools/vmchooser/data/vmchooser/smb.conf
+++ b/remote/modules/vmchooser/data/vmchooser/smb.conf
diff --git a/remote/tools/vmchooser/vmchooser.build b/remote/modules/vmchooser/vmchooser.build
index 536aa5d3..536aa5d3 100644
--- a/remote/tools/vmchooser/vmchooser.build
+++ b/remote/modules/vmchooser/vmchooser.build
diff --git a/remote/tools/vmchooser/vmchooser.conf b/remote/modules/vmchooser/vmchooser.conf
index ec1ceb86..ec1ceb86 100644
--- a/remote/tools/vmchooser/vmchooser.conf
+++ b/remote/modules/vmchooser/vmchooser.conf
diff --git a/remote/modules/xorg/xorg.build b/remote/modules/xorg/xorg.build
new file mode 100644
index 00000000..4adcd214
--- /dev/null
+++ b/remote/modules/xorg/xorg.build
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+fetch_source() {
+	:
+}
+
+build() {
+	COPYLIST="list_dpkg_output"
+	[ -e "$COPYLIST" ] && rm "$COPYLIST"
+
+	list_packet_files >> "$COPYLIST"
+	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+}
+
+post_copy() {
+	mkdir -p "${TARGET_BUILD_DIR}/etc/X11"
+	[ ! -e ${TARGET_BUILD_DIR}/etc/X11/X ] && ln -s /usr/bin/Xorg ${TARGET_BUILD_DIR}/etc/X11/X	
+	mkdir -p "${TARGET_BUILD_DIR}/var/lib/xkb"
+	cp /var/lib/xkb/server* "${TARGET_BUILD_DIR}/var/lib/xkb/" || perror "Copying /var/lib/xkb/server* to '${TARGET_BUILD_DIR}/var/lib/xkb/' failed."
+}
+
diff --git a/remote/tools/xorg/xorg.conf b/remote/modules/xorg/xorg.conf
index e41c25a5..e41c25a5 100644
--- a/remote/tools/xorg/xorg.conf
+++ b/remote/modules/xorg/xorg.conf
diff --git a/remote/core/data/init b/remote/rootfs/rootfs-stage31-default/data/init
index ef9c32a7..ef9c32a7 100755
--- a/remote/core/data/init
+++ b/remote/rootfs/rootfs-stage31-default/data/init
diff --git a/remote/rootfs/rootfs-stage31-default/rootfs-stage31-default.build b/remote/rootfs/rootfs-stage31-default/rootfs-stage31-default.build
new file mode 100644
index 00000000..d0a95238
--- /dev/null
+++ b/remote/rootfs/rootfs-stage31-default/rootfs-stage31-default.build
@@ -0,0 +1,134 @@
+#!/bin/bash
+fetch_source() {
+	:
+}
+
+build() {
+
+	BUILDDIR="${TARGET_DIR}/${MODULE}/build"
+
+	FILELIST="list_binaries_and_files"
+	[ -e "${FILELIST}" ] && rm "${FILELIST}"
+
+	for BIN in ${REQUIRED_BINARIES}
+	do
+		BIN_LOCATION=$(which ${BIN})
+		if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
+		then
+			pdebug "Processing $BIN at $BIN_LOCATION ..."
+			get_link_chain ${BIN_LOCATION} >> "${FILELIST}"
+		else
+			perror "${BIN} not found on the system! Please install it."
+		fi
+	done
+
+	for FILE in ${REQUIRED_DIRECTORIES}
+	do
+		[ ! -d ${FILE} ] && perror "Missing required directory $FILE"
+		echo ${FILE} >> "${FILELIST}"
+	done
+	for FILE in ${REQUIRED_FILES}
+	do
+		[ ! -f ${FILE} ] && perror "Missing required file $FILE"
+		echo ${FILE} >> "${FILELIST}"
+	done
+
+	local NUMFILES=$(cat "${FILELIST}" | wc -l)
+	if [ "x$NUMFILES" != "x" -a "x$NUMFILES" != "x0" ]; then
+		pinfo "File list generated at ${BUILDDIR}/${FILELIST} ($NUMFILES entries)"
+		tarcopy "$(cat "${FILELIST}")" "${BUILDDIR}"
+	fi
+}
+
+post_copy() {
+        generate_rootfs
+        copy_kernel_modules
+        generate_modules_map_files
+        copy_firmware
+}
+
+generate_rootfs() {
+        # create basic directory structure
+        mkdir -p "${TARGET_BUILD_DIR}"/{bin,dev,proc,run,etc,mnt,sys} \
+                || perror "Cannot create basic directory structure in '${TARGET_BUILD_DIR}'"
+
+        # copy device files from running system
+        cp -a /dev/{console,kmsg,mem,null,tty,tty0,tty1,tty9,urandom,zero} \
+                "${TARGET_BUILD_DIR}"/dev || perror "Cannot copy devices from running system"
+        
+        # copy libc and ld-linux
+        tarcopy "$(list_basic_libs)" "${TARGET_BUILD_DIR}"
+
+        # copy required files
+        tarcopy "${REQUIRED_FILES}" "${TARGET_BUILD_DIR}"
+
+        # copy static data
+        cp -r "${MODULE_DIR}"/core/data/* "${TARGET_BUILD_DIR}" 
+}
+
+copy_kernel_modules() {
+
+        local MODLIST="stage31_modules_list"
+        [ -e $MODLIST ] && rm -f $MODLIST
+
+        # process modules list
+        for MOD in ${REQUIRED_MODULES}; do
+                local MOD_PATH="/lib/modules/${KERNEL_VERSION}/${MOD}"
+                if [ ! -e "${MOD_PATH}" ]; then
+                        pwarning "Module $MOD not found. Skipping. (might cause problem on certain clients!)"
+                        continue
+                else
+                        pdebug "Copying "${MOD_PATH}""
+                        echo "${MOD_PATH}" >> "${MODLIST}"
+                fi
+        done
+
+        if [ -s "$MODLIST" ]; then
+                local MODLISTCOUNT=$(cat "$MODLIST" | wc -l)
+                pinfo "Copying $MODLISTCOUNT modules to stage 3.1 target directory."
+                tarcopy "$(cat "$MODLIST")" "${TARGET_BUILD_DIR}"
+        fi
+
+}
+
+generate_modules_map_files() {
+
+        # first strip modules.order of all the modules we don't use
+        cat /lib/modules/"${KERNEL_VERSION}"/modules.order | grep -E $(echo ${REQUIRED_MODULES} | tr '\ ' '|') \
+                >> "${TARGET_BUILD_DIR}"/lib/modules/"${KERNEL_VERSION}"/modules.order
+
+        # copy list of builtin kernel modules
+        cp /lib/modules/"${KERNEL_VERSION}"/modules.builtin "${TARGET_BUILD_DIR}"/lib/modules/"${KERNEL_VERSION}"
+        # with modules.order and modules.builtin, we can run depmod for the rest of the files
+        depmod -b "${TARGET_BUILD_DIR}"
+}
+
+copy_firmware() {
+
+        local FWLIST="stage31_firmware_list"
+        [ -e $FWLIST ] && rm -f $FWLIST
+
+        local FW_PATH="/lib/firmware"
+
+        # process firmware list
+        for FW in ${REQUIRED_FIRMWARE}; do
+                local FOUND=0
+                if [ -e "${FW_PATH}"/"${FW}" ]; then
+                        pdebug "Copying "${FW_PATH}"/"${FW}""
+                        echo "${FW_PATH}"/"${FW}" >> "$FWLIST"
+                        FOUND=1
+                fi
+                if [ -e "${FW_PATH}"/"${KERNEL_VERSION}"/"${FW}" ]; then
+                        pdebug "Copying "${FW_PATH}"/"${KERNEL_VERSION}"/"${FW}""
+                        echo "${FW_PATH}"/"${KERNEL_VERSION}"/"${FW}" >> "$FWLIST"
+                        FOUND=1
+                fi
+                [ $FOUND -ne 1 ] && pwarning "Neither "${FW_PATH}"/"${FW}" nor "${FW_PATH}"/"${KERNEL_VERSION}"/"${FW}" found on the system."
+        done
+
+        if [ -s "${FWLIST}" ]; then
+                local FWLISTCOUNT=$(cat "$FWLIST"|wc -l)
+                pinfo "Copying $FWLISTCOUNT firmware to stage 3.1 target directory."
+                tarcopy "$(cat "$FWLIST")" "${TARGET_BUILD_DIR}"
+        fi
+}
diff --git a/remote/tools/base31/base31.build b/remote/rootfs/rootfs-stage31-default/rootfs-stage31-default.conf
index e69de29b..e69de29b 100644
--- a/remote/tools/base31/base31.build
+++ b/remote/rootfs/rootfs-stage31-default/rootfs-stage31-default.conf
diff --git a/remote/tools/base32/data/etc/keymaps/de_DE b/remote/rootfs/rootfs-stage32-default/data/etc/keymaps/de_DE
index 375c2012..375c2012 100644
--- a/remote/tools/base32/data/etc/keymaps/de_DE
+++ b/remote/rootfs/rootfs-stage32-default/data/etc/keymaps/de_DE
diff --git a/remote/tools/base32/data/etc/profile b/remote/rootfs/rootfs-stage32-default/data/etc/profile
index 3784e784..3784e784 100644
--- a/remote/tools/base32/data/etc/profile
+++ b/remote/rootfs/rootfs-stage32-default/data/etc/profile
diff --git a/remote/tools/base32/data/etc/udhcpc.openslx.script b/remote/rootfs/rootfs-stage32-default/data/etc/udhcpc.openslx.script
index bff430ef..bff430ef 100755
--- a/remote/tools/base32/data/etc/udhcpc.openslx.script
+++ b/remote/rootfs/rootfs-stage32-default/data/etc/udhcpc.openslx.script
diff --git a/remote/tools/base32/base32.build b/remote/rootfs/rootfs-stage32-default/rootfs-stage32-default.build
index b0d567ff..c704752b 100644
--- a/remote/tools/base32/base32.build
+++ b/remote/rootfs/rootfs-stage32-default/rootfs-stage32-default.build
@@ -5,8 +5,6 @@ fetch_source() {
 
 build() {
 
-	BUILDDIR="${TOOL_DIR}/${TOOL}/build"
-
 	FILELIST="list_binaries_and_files"
 	[ -e "${FILELIST}" ] && rm "${FILELIST}"
 
@@ -43,8 +41,8 @@ build() {
 
 	local NUMFILES=$(cat "${FILELIST}" | wc -l)
 	if [ "x$NUMFILES" != "x" -a "x$NUMFILES" != "x0" ]; then
-		pinfo "File list generated at ${BUILDDIR}/${FILELIST} ($NUMFILES entries)"
-		tarcopy "$(cat "${FILELIST}")" "${BUILDDIR}"
+		pinfo "File list generated at ${MODULE_BUILD_DIR}/${FILELIST} ($NUMFILES entries)"
+		tarcopy "$(cat "${FILELIST}")" "${MODULE_BUILD_DIR}"
 	fi
 }
 
@@ -62,7 +60,7 @@ post_copy() {
         	> "${TARGET_BUILD_DIR}/etc/environment"
 
 	# copy static files
-	cp -r "${TOOL_DIR}/${TOOL}"/data/* "${TARGET_BUILD_DIR}" || perror "Copying static files from data/* failed."
+	cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" || perror "Copying static files from data/* failed."
 
 	# quick fix for /etc/fstab
 	echo "# no configuration" >> "${TARGET_BUILD_DIR}/etc/fstab"
diff --git a/remote/tools/base32/base32.conf b/remote/rootfs/rootfs-stage32-default/rootfs-stage32-default.conf
index cfb981f8..cfb981f8 100644
--- a/remote/tools/base32/base32.conf
+++ b/remote/rootfs/rootfs-stage32-default/rootfs-stage32-default.conf
diff --git a/remote/tools/base32/base32.conf.zypper b/remote/rootfs/rootfs-stage32-default/rootfs-stage32-default.conf.zypper
index 084bff5c..084bff5c 100644
--- a/remote/tools/base32/base32.conf.zypper
+++ b/remote/rootfs/rootfs-stage32-default/rootfs-stage32-default.conf.zypper
diff --git a/remote/setup_tools b/remote/setup_tools
index dc7fafda..b554f448 100755
--- a/remote/setup_tools
+++ b/remote/setup_tools
@@ -3,14 +3,14 @@
 MODE_DIR="${ROOT_DIR}/remote"
 
 #Create tools directory if not exists
-TOOL_DIR="${MODE_DIR}/tools"
+MODULES_DIR="${MODE_DIR}/modules"
 
 # Keep track of processed modules
 PROCESSED_MODULES=""
 
 initial_checks () {
 	# check for required tools
-	for BIN in git locate
+	for BIN in git locate depmod
 	do
 		local TEST=$(which ${BIN})
 		[ -z "$TEST" ] && pinfo "Installing $BIN..." && apt-get install $BIN
@@ -27,21 +27,21 @@ read_config () {
 	unset REQUIRED_PACKAGES
 	unset REQUIRED_DEPENDENCIES
 
-	local TOOL_CONFIG="${TOOL_DIR}/${TOOL}/${TOOL}.conf"
+	local MODULE_CONFIG="${MODULE_DIR}/${MODULE}.conf"
 
-	if [ -e "${TOOL_CONFIG}.${PACKET_MANAGER}" ]; then
+	if [ -e "${MODULE_CONFIG}.${PACKET_MANAGER}" ]; then
 		# a specific tool.conf seems to exist, try to use that one
 		# TODO: Maybe move this down right after loading the generic one, to allow "overloading".... but might be a bit confusing
-		. "${TOOL_CONFIG}.${PACKET_MANAGER}" || perror "Sourcing '${TOOL_CONFIG}.${PACKET_MANAGER}' failed."
+		. "${MODULE_CONFIG}.${PACKET_MANAGER}" || perror "Sourcing '${MODULE_CONFIG}.${PACKET_MANAGER}' failed."
 	else
 		# otherwise, use the generic one
-		[ ! -e "${TOOL_CONFIG}" ] && perror "Config for '$TOOL' not found."
-		. "${TOOL_CONFIG}" || perror "Sourcing '${TOOL_CONFIG}' failed."
+		[ ! -e "${MODULE_CONFIG}" ] && perror "Config for '$MODULE' not found."
+		. "${MODULE_CONFIG}" || perror "Sourcing '${MODULE_CONFIG}' failed."
 	fi
 }
 
 read_build () {
-	local BUILD_SCRIPT="${TOOL_DIR}/${TOOL}/${TOOL}.build"
+	local BUILD_SCRIPT="${MODULE_DIR}/${MODULE}.build"
 
 	[ ! -e "${BUILD_SCRIPT}" ] && perror "Build script for specified tool not found."
 
@@ -49,9 +49,9 @@ read_build () {
 }
 
 copyfileswithdependencies () {
-	[ ! -d build ] && pinfo "No build directory found, skipping dependency copying" && return 0
-	cd build
 
+	[ ! -d $MODULE_BUILD_DIR ] && pinfo "No build directory found, skipping dependency copying" && return 0
+	cd $MODULE_BUILD_DIR
 
 	COPYFILES_LIST="list_wanted_stage3.2"
 	[ -e ${COPYFILES_LIST} ] && rm ${COPYFILES_LIST}
@@ -81,8 +81,8 @@ copyfileswithdependencies () {
 		fi
 		for FILE in $FINAL_LIST; do
 			strip $FILE || pwarning "Could not strip '${FILE}'"
-			get_link_chain "${TOOL_DIR}/${TOOL}/build/${FILE}" "${TOOL_DIR}/${TOOL}/build" >> "${COPYFILES_LIST}"
-			get_dynamic_dependencies -l "${TOOL_DIR}/${TOOL}/build" "${FILE}" >> "${COPYFILES_LIST}"
+			get_link_chain "${MODULE_BUILD_DIR}/${FILE}" "${MODULE_BUILD_DIR}" >> "${COPYFILES_LIST}"
+			get_dynamic_dependencies -l "${MODULE_BUILD_DIR}" "${FILE}" >> "${COPYFILES_LIST}"
 		done
 	done
 
@@ -93,8 +93,8 @@ copyfileswithdependencies () {
 		do
 			pdebug "* $LOCATION"
 			strip $LOCATION || pwarning "Could not strip '${LOCATION}'"
-			get_link_chain "${TOOL_DIR}/${TOOL}/build/${LOCATION}" "${TOOL_DIR}/${TOOL}/build"  >> "${COPYFILES_LIST}"
-			get_dynamic_dependencies -l "${TOOL_DIR}/${TOOL}/build" "${LOCATION}" >> "${COPYFILES_LIST}"
+			get_link_chain "${MODULE_BUILD_DIR}/${LOCATION}" "${MODULE_BUILD_DIR}"  >> "${COPYFILES_LIST}"
+			get_dynamic_dependencies -l "${MODULE_BUILD_DIR}" "${LOCATION}" >> "${COPYFILES_LIST}"
 		done
 	done
 
@@ -107,21 +107,21 @@ copyfileswithdependencies () {
 		for BIN in $(find "./${ENTRY}" -type f -not -name '*.a' | xargs grep -l '^.ELF')
 		do
 			pdebug "   Searching libs for ${BIN}..."
-			get_link_chain "${TOOL_DIR}/${TOOL}/build/${BIN}" "${TOOL_DIR}/${TOOL}/build" >> "${COPYFILES_LIST}"
-			get_dynamic_dependencies -l "${TOOL_DIR}/${TOOL}/build" "${BIN}" >> "${COPYFILES_LIST}"
+			get_link_chain "${MODULE_BUILD_DIR}/${BIN}" "${MODULE_BUILD_DIR}" >> "${COPYFILES_LIST}"
+			get_dynamic_dependencies -l "${MODULE_BUILD_DIR}" "${BIN}" >> "${COPYFILES_LIST}"
 		done
 	done
 
 	[ ! -z "${REQUIRED_FILES}" ] && pinfo "Gathering required files from config file..."
 	for ENTRY in ${REQUIRED_FILES}
 	do
-		get_link_chain "${TOOL_DIR}/${TOOL}/build/${ENTRY}" "${TOOL_DIR}/${TOOL}/build" >> "${COPYFILES_LIST}"
-		get_dynamic_dependencies -l "${TOOL_DIR}/${TOOL}/build" "${TOOL_DIR}/${TOOL}/build/.${ENTRY}" >> "${COPYFILES_LIST}"
+		get_link_chain "${MODULE_BUILD_DIR}/${ENTRY}" "${MODULE_BUILD_DIR}" >> "${COPYFILES_LIST}"
+		get_dynamic_dependencies -l "${MODULE_BUILD_DIR}" "${MODULE_BUILD_DIR}/.${ENTRY}" >> "${COPYFILES_LIST}"
 	done
 
 
 	#copy to initramfsdir
-	pdebug "[stage32] Completed file list generation at ${TOOL_DIR}/${TOOL}/build/${COPYFILES_LIST}."
+	pdebug "[stage32] File list generated at ${MODULE_BUILD_DIR}/${COPYFILES_LIST}."
 	if [ -s "$COPYFILES_LIST" ]; then
 		local CLISTCOUNT=$(cat "$COPYFILES_LIST" | wc -l)
 		pinfo "Copying $CLISTCOUNT files to stage 3.2 target directory."
@@ -170,33 +170,34 @@ generate_target() {
 
 process_module() {
 	[ "$#" -ne "1" ] && perror "process_module: want 1 param."
-	local TOOL="$1"
-	[[ "$PROCESSED_MODULES" == *"!${TOOL}!"* ]] && return # Already processed this module
-	PROCESSED_MODULES="${PROCESSED_MODULES}!${TOOL}!"
+	local MODULE="$1"
+	local MODULE_DIR="${TARGET_DIR}/${MODULE}"
+	local MODULE_BUILD_DIR="${MODULE_DIR}/build"
+	[[ "$PROCESSED_MODULES" == *"!${MODULE}!"* ]] && return # Already processed this module
+	PROCESSED_MODULES="${PROCESSED_MODULES}!${MODULE}!"
 	local TOOL_STR=""
-	pinfo ">>>>>>>>>>>>>>>>> Processing module [ $TOOL ]"
-	TOOL_STR="[${TOOL}]"
-	if [ -d "${TOOL_DIR}/${TOOL}" ];
-	then
+	pinfo ">>>>>>>>>>>>>>>>> Processing module [ $MODULE ]"
+	TOOL_STR="[${MODULE}]"
+	if [ -d "${MODULE_DIR}" ]; then
 
 		#[ "x$DEBUG" != "x1" ] \
 		#	&& echo "Logging to ${TOOL_DIR}/${TOOL}/stage32.log" \
 		#	&& exec 6>&1 > ${TOOL_DIR}/${TOOL}/stage32.log
 		# TODO: Make above work with the new logging system (add function to logging.inc to switch logfile)
-		cd "${TOOL_DIR}/${TOOL}" || perror "Tool dir '${TOOL_DIR}/${TOOL}' seems to exist, but cd to it failed."
+		cd "${MODULE_DIR}" || perror "Module dir '${MODULE_DIR}' seems to exist, but cd to it failed."
 		pinfo "## Reading config"
 		read_config
 		# Check if this module has a dependency that wasn't built yet:
 		if [ ! -z "$REQUIRED_MODULES" ]; then
-			pinfo "$TOOL depends on ${REQUIRED_MODULES}...."
+			pinfo "$MODULE depends on ${REQUIRED_MODULES}...."
 			for DEP in $REQUIRED_MODULES; do
 				#[[ "$DESIRED_MODULES" != *"!${DEP}!"* ]] && perror "$TOOL has dependency $DEP, but $DEP is not in current profile."
 				process_module "$DEP"
 			done
 			# Read old config again, as it got overwritten by the deps
-			cd "${TOOL_DIR}/${TOOL}" || perror "Tool dir '${TOOL_DIR}/${TOOL}' seems to exist, but cd to it failed (after building deps)."
+			cd "${MODULE_DIR}" || perror "Tool dir '${MODULE_DIR}' seems to exist, but cd to it failed (after building deps)."
 			read_config
-			pinfo "<<<<<<<<<<<<<<<<< Dependency modules processed, back to module [ $TOOL ]"
+			pinfo "<<<<<<<<<<<<<<<<< Dependency modules processed, back to module [ $MODULE ]"
 		fi
 		pinfo "## Reading build"
 		read_build
@@ -207,7 +208,7 @@ process_module() {
 		pinfo "## Building"
 		build
 		# remove *.la files as they might confuse libtool/linker of other tool packages
-		find "${TOOL_DIR}/${TOOL}/build" -name '*.la' -exec rm -f {} \;
+		find "${MODULE_DIR}/build" -name '*.la' -exec rm -f {} \;
 		pinfo "## Copying files with dependencies"
 		copyfileswithdependencies
 		pinfo "## Post copy"
@@ -218,7 +219,7 @@ process_module() {
 		# TODO
 		pinfo "Module completed."
 	else
-		perror "Tool directory for '$TOOL' not found."
+		perror "Module directory for '$MODULE' not found."
 		# maybe make this a warning instead of error?
 	fi
 }
@@ -229,8 +230,8 @@ clean_tools() {
 		if [ -d ${TARGET_BUILD_DIR} ]; then
 			rm -rf "${TARGET_BUILD_DIR}"/* || perror "Error deleting $TARGET_BUILD_DIR"
 		fi
-	        for TOOL in $(ls ${TOOL_DIR}); do
-			clean_tool $TOOL
+	        for MODULE in $(ls ${MODULES_DIR}); do
+			clean_tool $MODULE
         	done
 	else 
 		while (( "$#" )); do
@@ -241,25 +242,25 @@ clean_tools() {
 }
 
 clean_tool() {
-        TOOLDIR=${TOOL_DIR}/$1
-	pinfo "Cleaning '${TOOLDIR}'..."
+        local MODULE_DIR=${MODULES_DIR}/$1
+	pinfo "Cleaning '${MODULE_DIR}'..."
 	#[ -e ${TOOLDIR}/build/list_wanted_stage3.2 ] && cd ${TARGET_BUILD_DIR} \
 	#	&& xargs rm < ${TOOLDIR}/build/list_wanted_stage3.2
 	#[ -d ${TOOLDIR}/data ] && cd ${TARGET_BUILD_DIR} \
 #		&& xargs rm < $(find ${TOOLDIR}/data -type f)
-	if [ -e ${TOOLDIR}/.built ]; then
-		rm "${TOOLDIR}/.built" || perror "Could not clear built flag"
+	if [ -e ${MODULE_DIR}/.built ]; then
+		rm "${MODULE_DIR}/.built" || perror "Could not clear built flag"
 	fi
-	if [ -e ${TOOLDIR}/.fetched_source ]; then
-		rm "${TOOLDIR}/.fetched_source" || perror "Could not clear fetched_source flag"
+	if [ -e ${MODULE_DIR}/.fetched_source ]; then
+		rm "${MODULE_DIR}/.fetched_source" || perror "Could not clear fetched_source flag"
 	fi
-	if [ -d ${TOOLDIR}/build ]; then
-		rm -rf "${TOOLDIR}/build" || perror "Could not delete build path"
+	if [ -d ${MODULE_DIR}/build ]; then
+		rm -rf "${MODULE_DIR}/build" || perror "Could not delete build path"
 	fi
-	if [ -d ${TOOLDIR}/src ]; then
-		rm -rf "${TOOLDIR}/src" || perror "Could not delete src path"
+	if [ -d ${MODULE_DIR}/src ]; then
+		rm -rf "${MODULE_DIR}/src" || perror "Could not delete src path"
 	fi
-	if [ -e ${TOOLDIR}/list_binaries_and_files ]; then
-		rm "${TOOLDIR}/list_binaries_and_files" || perror "Could not delete list_binaries_and_files"
+	if [ -e ${MODULE_DIR}/list_binaries_and_files ]; then
+		rm "${MODULE_DIR}/list_binaries_and_files" || perror "Could not delete list_binaries_and_files"
 	fi
 }
diff --git a/remote/stage3.2/base32 b/remote/stage3.2/base32
deleted file mode 120000
index 3de6f87a..00000000
--- a/remote/stage3.2/base32
+++ /dev/null
@@ -1 +0,0 @@
-../tools/base32/
\ No newline at end of file
diff --git a/remote/stage3.2/busybox b/remote/stage3.2/busybox
index 745a1eab..0880d250 120000
--- a/remote/stage3.2/busybox
+++ b/remote/stage3.2/busybox
@@ -1 +1 @@
-../tools/busybox
\ No newline at end of file
+../modules/busybox
\ No newline at end of file
diff --git a/remote/stage3.2/consolekit b/remote/stage3.2/consolekit
index c7e26d7d..ea16698b 120000
--- a/remote/stage3.2/consolekit
+++ b/remote/stage3.2/consolekit
@@ -1 +1 @@
-../tools/consolekit
\ No newline at end of file
+../modules/consolekit
\ No newline at end of file
diff --git a/remote/stage3.2/dbus b/remote/stage3.2/dbus
index 940d377c..869ba187 120000
--- a/remote/stage3.2/dbus
+++ b/remote/stage3.2/dbus
@@ -1 +1 @@
-../tools/dbus
\ No newline at end of file
+../modules/dbus
\ No newline at end of file
diff --git a/remote/stage3.2/kdm b/remote/stage3.2/kdm
index 65dce0e5..259b5e7c 120000
--- a/remote/stage3.2/kdm
+++ b/remote/stage3.2/kdm
@@ -1 +1 @@
-../tools/kdm
\ No newline at end of file
+../modules/kdm
\ No newline at end of file
diff --git a/remote/stage3.2/plymouth b/remote/stage3.2/plymouth
index 85eaa0e3..0dcc7319 120000
--- a/remote/stage3.2/plymouth
+++ b/remote/stage3.2/plymouth
@@ -1 +1 @@
-../tools/plymouth
\ No newline at end of file
+../modules/plymouth
\ No newline at end of file
diff --git a/remote/stage3.2/policykit b/remote/stage3.2/policykit
index af321cce..def43fa6 120000
--- a/remote/stage3.2/policykit
+++ b/remote/stage3.2/policykit
@@ -1 +1 @@
-../tools/policykit
\ No newline at end of file
+../modules/policykit
\ No newline at end of file
diff --git a/remote/stage3.2/rootfs-stage32-default b/remote/stage3.2/rootfs-stage32-default
new file mode 120000
index 00000000..46d20ea6
--- /dev/null
+++ b/remote/stage3.2/rootfs-stage32-default
@@ -0,0 +1 @@
+../rootfs/rootfs-stage32-default
\ No newline at end of file
diff --git a/remote/stage3.2/rsyslogd b/remote/stage3.2/rsyslogd
index b76b8804..737ff3c0 120000
--- a/remote/stage3.2/rsyslogd
+++ b/remote/stage3.2/rsyslogd
@@ -1 +1 @@
-../tools/rsyslogd
\ No newline at end of file
+../modules/rsyslogd
\ No newline at end of file
diff --git a/remote/stage3.2/sshd b/remote/stage3.2/sshd
index b6a28fd7..92c8ad1a 120000
--- a/remote/stage3.2/sshd
+++ b/remote/stage3.2/sshd
@@ -1 +1 @@
-../tools/sshd
\ No newline at end of file
+../modules/sshd
\ No newline at end of file
diff --git a/remote/stage3.2/systemd b/remote/stage3.2/systemd
index e19a176e..b6060d82 120000
--- a/remote/stage3.2/systemd
+++ b/remote/stage3.2/systemd
@@ -1 +1 @@
-../tools/systemd
\ No newline at end of file
+../modules/systemd
\ No newline at end of file
diff --git a/remote/stage3.2/xorg b/remote/stage3.2/xorg
index d7b6db22..9750345d 120000
--- a/remote/stage3.2/xorg
+++ b/remote/stage3.2/xorg
@@ -1 +1 @@
-../tools/xorg
\ No newline at end of file
+../modules/xorg
\ No newline at end of file
diff --git a/remote/tools/base31/base31.conf b/remote/tools/base31/base31.conf
deleted file mode 100644
index e69de29b..00000000
--- a/remote/tools/base31/base31.conf
+++ /dev/null
diff --git a/remote/tools/sshd/sshd.build b/remote/tools/sshd/sshd.build
deleted file mode 100644
index f4e95b6c..00000000
--- a/remote/tools/sshd/sshd.build
+++ /dev/null
@@ -1,25 +0,0 @@
-fetch_source() {
-	:
-}
-
-build() {
-
-	BUILDDIR=${TOOL_DIR}/${TOOL}/build/usr/sbin
-        mkdir -p "${BUILDDIR}"
-
-	BIN_LOCATION=$(which sshd)
-	[ ! -z ${BIN_LOCATION} ] && BIN_LOCATION=$(readlink -f "$BIN_LOCATION")
-	if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
-	then
-		cp "${BIN_LOCATION}" "${BUILDDIR}/"
-	else
-		echo "[$TOOL] ${BIN} not found on the system! Please install it."
-		exit 1
-	fi
-
-}
-
-post_copy() {	
-	mkdir -p "${TARGET_BUILD_DIR}/var/run/sshd"
-	cp -r "${TOOL_DIR}"/${TOOL}/data/* "${TARGET_BUILD_DIR}/"
-}
diff --git a/remote/tools/xorg/xorg.build b/remote/tools/xorg/xorg.build
deleted file mode 100644
index 56609ecb..00000000
--- a/remote/tools/xorg/xorg.build
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-fetch_source() {
-	:
-}
-
-build() {
-
-	BUILDDIR="$TOOL_DIR/$TOOL/build"
-	COPYLIST="list_dpkg_output"
-	[ -e "$COPYLIST" ] && rm "$COPYLIST"
-
-	list_packet_files >> "$COPYLIST"
-	tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR"
-}
-
-post_copy() {
-	mkdir -p "$TARGET_BUILD_DIR/etc/X11"
-	[ ! -e ${TARGET_BUILD_DIR}/etc/X11/X ] && ln -s /usr/bin/Xorg ${TARGET_BUILD_DIR}/etc/X11/X	
-	mkdir -p "$TARGET_BUILD_DIR/var/lib/xkb"
-	cp /var/lib/xkb/server* "$TARGET_BUILD_DIR/var/lib/xkb/" || perror "Copying /var/lib/xkb/server* to '$TARGET_BUILD_DIR/var/lib/xkb/' failed."
-}
-