diff --git a/scripts/Bootstrap/build_pmodules.sh b/scripts/Bootstrap/build_pmodules.sh
index 90f7675..f36cbfc 100755
--- a/scripts/Bootstrap/build_pmodules.sh
+++ b/scripts/Bootstrap/build_pmodules.sh
@@ -3,9 +3,11 @@
 declare -r BASE_DIR=$(cd "$(dirname $0)/../.." && pwd)
 declare -r BOOTSTRAP_DIR="${BASE_DIR}/scripts/Bootstrap"
 
-source "/opt/psi/config/environment.bash"
 source "${BASE_DIR}/config/pmodules_version.conf"
 
+unset PMODULES_HOME
+source "/opt/psi/config/environment.bash"
+
 ${BOOTSTRAP_DIR}/gettext.build --bootstrap
 ${BOOTSTRAP_DIR}/getopt.build --bootstrap
 ${BOOTSTRAP_DIR}/dialog.build --bootstrap
diff --git a/scripts/Bootstrap/install_pmodules.sh b/scripts/Bootstrap/install_pmodules.sh
index 7c3fc05..7673c49 100755
--- a/scripts/Bootstrap/install_pmodules.sh
+++ b/scripts/Bootstrap/install_pmodules.sh
@@ -3,22 +3,27 @@
 declare -r BASE_DIR=$(cd "$(dirname $0)/../.." && pwd)
 declare -r BOOTSTRAP_DIR="${BASE_DIR}/scripts/Bootstrap"
 
-source "/opt/psi/config/environment.bash"
 source "${BASE_DIR}/config/pmodules_version.conf"
 
+unset PMODULES_HOME
+source "/opt/psi/config/environment.bash"
+
 sed_cmd="s:@PMODULES_HOME@:${PMODULES_HOME}:g;"
 sed_cmd+="s:@PMODULES_VERSION@:${PMODULES_VERSION}:g;"
 sed_cmd+="s:@MODULES_VERSION@:${MODULES_VERSION}:g"
 sed "${sed_cmd}" "${BOOTSTRAP_DIR}/modulecmd.bash" > "${BOOTSTRAP_DIR}/modulecmd"
 
-install -d -m 0755 "${PMODULES_HOME}/etc"
+install -d -m 0755 "${PMODULES_HOME}/bin"
+install -d -m 0755 "${PMODULES_HOME}/config"
+install -d -m 0755 "${PMODULES_HOME}/init"
+install -d -m 0755 "${PMODULES_HOME}/lib"
 
 install -m 0755 "${BOOTSTRAP_DIR}/modulecmd" "${PMODULES_HOME}/bin"
 install -m 0755 "${BOOTSTRAP_DIR}/init_local_env.bash" "${PMODULES_HOME}/bin"
 install -m 0755 "${BOOTSTRAP_DIR}/modsync.bash" "${PMODULES_HOME}/bin"
 install -m 0755 "${BOOTSTRAP_DIR}/dialog.bash" "${PMODULES_HOME}/bin"
 
-install -m 0644 "${BOOTSTRAP_DIR}/modulerc" "${PMODULES_HOME}/etc"
+#install -m 0644 "${BOOTSTRAP_DIR}/modulerc" "${PMODULES_HOME}/config"
 
 install -m 0644 "${BOOTSTRAP_DIR}/bash" "${PMODULES_HOME}/init"
 install -m 0644 "${BOOTSTRAP_DIR}/bash_completion" "${PMODULES_HOME}/init"