diff --git a/scripts/Bootstrap/compile_pmodules.sh b/scripts/Bootstrap/compile_pmodules.sh
index 7fb50c8..3b99ce6 100755
--- a/scripts/Bootstrap/compile_pmodules.sh
+++ b/scripts/Bootstrap/compile_pmodules.sh
@@ -49,6 +49,6 @@ fi
 
 if [[ ! -e "${PMODULES_HOME}/bin/modulecmd.tcl" ]]; then
 	build Modules "${MODULES_VERSION}"
-	mv -v "${PMODULES_HOME}/bin/modulecmd" "${PMODULES_HOME}/bin/modulecmd.tcl"
+	mv -v "${PMODULES_HOME}/bin/modulecmd" "${PMODULES_HOME}/libexec/modulecmd.tcl"
 fi
 echo "Done..."
diff --git a/scripts/Bootstrap/install_pmodules.sh b/scripts/Bootstrap/install_pmodules.sh
index b4c0c6a..a9e02f8 100755
--- a/scripts/Bootstrap/install_pmodules.sh
+++ b/scripts/Bootstrap/install_pmodules.sh
@@ -16,7 +16,7 @@ echo "Installing to ${PMODULES_HOME} ..."
 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}" "${SRC_DIR}/modulecmd.in" > "${SRC_DIR}/modulecmd"
+sed "${sed_cmd}" "${SRC_DIR}/modulecmd.bash.in" > "${SRC_DIR}/modulecmd.bash"
 sed "${sed_cmd}" "${SRC_DIR}/modmanage.bash.in" > "${SRC_DIR}/modmanage.bash"
 sed "${sed_cmd}" "${SRC_DIR}/environment.bash.in" > "${SRC_DIR}/environment.bash"
 
@@ -25,19 +25,20 @@ install -d -m 0755 "${PMODULES_HOME}/config"
 install -d -m 0755 "${PMODULES_HOME}/init"
 install -d -m 0755 "${PMODULES_HOME}/lib"
 
-install -m 0755 "${SRC_DIR}/modulecmd" "${PMODULES_HOME}/bin"
-install -m 0755 "${SRC_DIR}/modmanage" "${PMODULES_HOME}/bin"
-install -m 0755 "${SRC_DIR}/modmanage.bash" "${PMODULES_HOME}/bin"
-install -m 0755 "${SRC_DIR}/dialog.bash" "${PMODULES_HOME}/bin"
+install -m 0755 "${SRC_DIR}/modulecmd"		"${PMODULES_HOME}/bin"
+install -m 0755 "${SRC_DIR}/modulecmd.bash"	"${PMODULES_HOME}/libexec"
+install -m 0755 "${SRC_DIR}/modmanage"		"${PMODULES_HOME}/bin"
+install -m 0755 "${SRC_DIR}/modmanage.bash"	"${PMODULES_HOME}/libexec"
+install -m 0755 "${SRC_DIR}/dialog.bash"	"${PMODULES_HOME}/bin"
 
-install -m 0755 "${SRC_DIR}/environment.bash" "${PMODULES_HOME}/config"
-install -m 0755 "${SRC_DIR}/profile.bash" "${PMODULES_HOME}/config"
+install -m 0755 "${SRC_DIR}/environment.bash"	"${PMODULES_HOME}/config"
+install -m 0755 "${SRC_DIR}/profile.bash"	"${PMODULES_HOME}/config"
 
-install -m 0644 "${SRC_DIR}/bash" "${PMODULES_HOME}/init"
-install -m 0644 "${SRC_DIR}/bash_completion" "${PMODULES_HOME}/init"
+install -m 0644 "${SRC_DIR}/bash"		"${PMODULES_HOME}/init"
+install -m 0644 "${SRC_DIR}/bash_completion"	"${PMODULES_HOME}/init"
 
-install -m 0644 "${SRC_DIR}/libpmodules.bash" "${PMODULES_HOME}/lib"
-install -m 0644 "${SRC_DIR}/libmodules.tcl" "${PMODULES_HOME}/lib/tcl8.6"
+install -m 0644 "${SRC_DIR}/libpmodules.bash"	"${PMODULES_HOME}/lib"
+install -m 0644 "${SRC_DIR}/libmodules.tcl"	"${PMODULES_HOME}/lib/tcl8.6"
 
 {
 	cd "${PMODULES_HOME}/lib/tcl8.6"