diff --git a/build_lxc.sh b/tools/build_lxc.sh
similarity index 99%
rename from build_lxc.sh
rename to tools/build_lxc.sh
index 65a06cb..d4df344 100755
--- a/build_lxc.sh
+++ b/tools/build_lxc.sh
@@ -11,6 +11,9 @@ if ! grep -q natty /etc/lsb-release; then
     echo "WARNING: this script has only been tested on natty"
 fi
 
+# Move to top devstack dir
+cd ..
+
 # Abort if localrc is not set
 if [ ! -e ./localrc ]; then
     echo "You must have a localrc with ALL necessary passwords defined before proceeding."
diff --git a/build_lxc_multi.sh b/tools/build_lxc_multi.sh
similarity index 100%
rename from build_lxc_multi.sh
rename to tools/build_lxc_multi.sh
diff --git a/lxc_network_hostonlyplusnat.sh b/tools/lxc_network_hostonlyplusnat.sh
similarity index 100%
rename from lxc_network_hostonlyplusnat.sh
rename to tools/lxc_network_hostonlyplusnat.sh