diff --git a/lib/libem.bash b/lib/libem.bash
index 51e741e..e59b0d0 100644
--- a/lib/libem.bash
+++ b/lib/libem.bash
@@ -195,7 +195,7 @@ function em.add_to_family() {
 	if [[ -z ${1} ]]; then
 		die 42 "${FUNCNAME}: Missing family argument."
 	fi
-	if [[ ! -d ${PSI_PREFIX}/${PSI_MODULES_ROOT}/${1} ]]; then
+	if [[ ! -d ${PSI_PREFIX}/${PSI_TEMPLATES_DIR}/${1} ]]; then
 		die 43 "${1}: family does not exist."
 	fi
 	MODULE_FAMILY=$1
@@ -243,7 +243,7 @@ function _load_build_dependencies() {
 		fi
 		if ! module_is_available "$m"; then
 		        debug "${m}: module not available"
-			local rels=( ${releases//: } )
+			local rels=( ${releases//:/ } )
 			for rel in "${rels[@]}"; do
 				debug "${m}: check release \"${rel}\""
 				eval $("${MODULECMD}" bash use ${rel})
diff --git a/scripts/Bootstrap/Modules.build b/scripts/Bootstrap/Modules/build
similarity index 100%
rename from scripts/Bootstrap/Modules.build
rename to scripts/Bootstrap/Modules/build
diff --git a/scripts/Bootstrap/bash b/scripts/Bootstrap/Pmodules/bash
similarity index 100%
rename from scripts/Bootstrap/bash
rename to scripts/Bootstrap/Pmodules/bash
diff --git a/scripts/Bootstrap/bash_completion b/scripts/Bootstrap/Pmodules/bash_completion
similarity index 100%
rename from scripts/Bootstrap/bash_completion
rename to scripts/Bootstrap/Pmodules/bash_completion
diff --git a/scripts/Bootstrap/dialog.bash b/scripts/Bootstrap/Pmodules/dialog.bash
similarity index 100%
rename from scripts/Bootstrap/dialog.bash
rename to scripts/Bootstrap/Pmodules/dialog.bash
diff --git a/scripts/Bootstrap/environment.bash b/scripts/Bootstrap/Pmodules/environment.bash
similarity index 100%
rename from scripts/Bootstrap/environment.bash
rename to scripts/Bootstrap/Pmodules/environment.bash
diff --git a/scripts/Bootstrap/init_local_env.bash b/scripts/Bootstrap/Pmodules/init_local_env.bash
similarity index 100%
rename from scripts/Bootstrap/init_local_env.bash
rename to scripts/Bootstrap/Pmodules/init_local_env.bash
diff --git a/scripts/Bootstrap/libmodules.tcl b/scripts/Bootstrap/Pmodules/libmodules.tcl
similarity index 100%
rename from scripts/Bootstrap/libmodules.tcl
rename to scripts/Bootstrap/Pmodules/libmodules.tcl
diff --git a/scripts/Bootstrap/modsync.bash b/scripts/Bootstrap/Pmodules/modsync.bash
similarity index 100%
rename from scripts/Bootstrap/modsync.bash
rename to scripts/Bootstrap/Pmodules/modsync.bash
diff --git a/scripts/Bootstrap/modulecmd.bash b/scripts/Bootstrap/Pmodules/modulecmd.bash
similarity index 100%
rename from scripts/Bootstrap/modulecmd.bash
rename to scripts/Bootstrap/Pmodules/modulecmd.bash
diff --git a/scripts/Bootstrap/profile.bash b/scripts/Bootstrap/Pmodules/profile.bash
similarity index 100%
rename from scripts/Bootstrap/profile.bash
rename to scripts/Bootstrap/Pmodules/profile.bash
diff --git a/scripts/Bootstrap/Tcl.build b/scripts/Bootstrap/Tcl/build
similarity index 100%
rename from scripts/Bootstrap/Tcl.build
rename to scripts/Bootstrap/Tcl/build
diff --git a/scripts/Bootstrap/bash.build b/scripts/Bootstrap/bash/build
similarity index 100%
rename from scripts/Bootstrap/bash.build
rename to scripts/Bootstrap/bash/build
diff --git a/scripts/Bootstrap/build_pmodules.sh b/scripts/Bootstrap/compile_pmodules.sh
similarity index 100%
rename from scripts/Bootstrap/build_pmodules.sh
rename to scripts/Bootstrap/compile_pmodules.sh
diff --git a/scripts/Bootstrap/dialog.build b/scripts/Bootstrap/dialog/build
similarity index 100%
rename from scripts/Bootstrap/dialog.build
rename to scripts/Bootstrap/dialog/build
diff --git a/scripts/Bootstrap/getopt.build b/scripts/Bootstrap/getopt/build
similarity index 100%
rename from scripts/Bootstrap/getopt.build
rename to scripts/Bootstrap/getopt/build
diff --git a/scripts/Bootstrap/gettext.build b/scripts/Bootstrap/gettext/build
similarity index 100%
rename from scripts/Bootstrap/gettext.build
rename to scripts/Bootstrap/gettext/build