diff --git a/10-build-bash b/10-build-bash
new file mode 100755
index 0000000..8ac20b7
--- /dev/null
+++ b/10-build-bash
@@ -0,0 +1,48 @@
+#!/bin/bash
+#
+# https://www.gnu.org/software/bash/
+#
+
+set -x
+
+P=bash
+V=${BASH5_VERSION:-5.1.16}
+
+FNAME="$P-$V.tar.gz"
+DOWNLOAD_URL="https://ftp.gnu.org/gnu/$P/${FNAME}"
+
+PREFIX="${PMODULES_HOME}"
+SRC_FILE="${PMODULES_DISTFILESDIR}/${FNAME}"
+SRC_DIR="${PMODULES_TMPDIR}/$P-$V/src"
+BUILD_DIR="${PMODULES_TMPDIR}/$P-$V/build"
+
+trap "pb_exit" EXIT
+
+# download
+test -r "${SRC_FILE}" || curl -L --output "$_" "${DOWNLOAD_URL}" || exit ${PB_ERR_DOWNLOAD}
+
+# unpack
+mkdir -p "${SRC_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
+tar --directory "${SRC_DIR}" --strip-components 1 -xv -f "${SRC_FILE}" || exit ${PB_ERR_UNTAR}
+
+# configure
+mkdir -p "${BUILD_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
+loadablesdir="${PREFIX}/${UTILBIN_DIR}/builtins" \
+"${SRC_DIR}/configure" \
+	--prefix="${PREFIX}" \
+	--bindir="${PREFIX}/${UTILBIN_DIR}" \
+        || exit ${PB_ERR_CONFIGURE}
+
+# compile & install
+make -j ${NJOBS} || exit ${PB_ERR_MAKE}
+make -C examples/loadables -j ${NJOBS} || exit ${PB_ERR_MAKE}
+make install || exit ${PB_ERR_INSTALL}
+
+# post-install
+rm -rf "${PREFIX}/include/bash"
+rm -rf "${PREFIX}/share/locale"
+
+# Local Variables:
+# mode: shell-script-mode
+# sh-basic-offset: 8
+# End:
diff --git a/20-build-tcl b/20-build-tcl
new file mode 100755
index 0000000..6b54d94
--- /dev/null
+++ b/20-build-tcl
@@ -0,0 +1,61 @@
+#!/bin/bash
+#
+# https://www.tcl.tk
+#
+
+set -x
+
+P=tcl
+V=${TCL_VERSION:-8.6.12}
+
+FNAME="$P$V-src.tar.gz"
+DOWNLOAD_URL="https://prdownloads.sourceforge.net/tcl/${FNAME}"
+
+PREFIX="${PMODULES_HOME}"
+SRC_FILE="${PMODULES_DISTFILESDIR}/${FNAME}"
+SRC_DIR="${PMODULES_TMPDIR}/$P-$V/src"
+BUILD_DIR="${PMODULES_TMPDIR}/$P-$V/build"
+
+trap "pb_exit" EXIT
+
+# download
+test -r "${SRC_FILE}" || curl -L --output "$_" "${DOWNLOAD_URL}" || exit ${PB_ERR_DOWNLOAD}
+
+# unpack
+mkdir -p "${SRC_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
+tar --directory "${SRC_DIR}" --strip-components 1 -xv -f "${SRC_FILE}" || exit ${PB_ERR_UNTAR}
+
+# configure
+mkdir -p "${BUILD_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
+case $(uname -s) in
+Linux )
+	srcdir="${SRC_DIR}/unix"
+	;;
+Darwin )
+	srcdir="${SRC_DIR}/macosx"
+	;;
+* )
+	echo "Oops: unsupported OS!" 1>&2
+	exit ${PB_ERR_SYSTEM}
+	;;
+esac
+"${srcdir}"/configure \
+	--prefix="${PREFIX}" \
+	--bindir="${PREFIX}/${UTILBIN_DIR}" \
+	--mandir="${PREFIX}/share/man" \
+	--enable-shared=no \
+        || exit ${PB_ERR_CONFIGURE}
+
+# compile & install
+make -j ${NJOBS} || exit ${PB_ERR_MAKE}
+make install || exit ${PB_ERR_INSTALL}
+
+# post-install
+{ cd "${PREFIX}/${UTILBIN_DIR}" && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
+rm -rf "${PREFIX}/share/man/man3"
+rm -rf "${PREFIX}/share/man/mann"
+
+# Local Variables:
+# mode: shell-script-mode
+# sh-basic-offset: 8
+# End:
diff --git a/30-build-tcllib b/30-build-tcllib
new file mode 100755
index 0000000..c81a0a0
--- /dev/null
+++ b/30-build-tcllib
@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# https://core.tcl-lang.org
+#
+
+set -x
+
+P=tcllib
+V=${TCLLIB_VERSION:-1.21}
+
+FNAME="$P-$V.tar.gz"
+DOWNLOAD_URL="https://core.tcl-lang.org/tcllib/uv/${FNAME}" 
+PREFIX="${PMODULES_HOME}"
+SRC_FILE="${PMODULES_DISTFILESDIR}/${FNAME}"
+SRC_DIR="${PMODULES_TMPDIR}/$P-$V/src"
+BUILD_DIR="${PMODULES_TMPDIR}/$P-$V/build"
+
+trap "pb_exit" EXIT
+
+# download
+test -r "${SRC_FILE}" || curl -L --output "$_" "${DOWNLOAD_URL}" || exit ${PB_ERR_DOWNLOAD}
+
+# unpack
+mkdir -p "${SRC_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
+tar --directory "${SRC_DIR}" --strip-components 1 -xv -f "${SRC_FILE}" || exit ${PB_ERR_UNTAR}
+
+# configure
+mkdir -p "${BUILD_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
+"${SRC_DIR}"/configure \
+	--prefix="${PREFIX}" \
+	--mandir="${PREFIX}/share/man" \
+        || exit ${PB_ERR_CONFIGURE}
+
+# compile & install
+make -j ${NJOBS} || exit ${PB_ERR_MAKE}
+make install || exit ${PB_ERR_INSTALL}
+
+# post-install
+rm -rf "${PREFIX}/share/man/mann"
+
+# Local Variables:
+# mode: shell-script-mode
+# sh-basic-offset: 8
+# End:
diff --git a/40-build-modules b/40-build-modules
new file mode 100755
index 0000000..73ee00d
--- /dev/null
+++ b/40-build-modules
@@ -0,0 +1,79 @@
+#!/bin/bash
+#
+# https://core.tcl-lang.org
+#
+
+set -x
+
+P=modules
+V=${MODULES_VERSION:-3.2.10.1}
+
+FNAME="$P-$V.tar.gz"
+DOWNLOAD_URL="https://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2"
+
+PREFIX="${PMODULES_HOME}"
+SRC_FILE="${PMODULES_DISTFILESDIR}/${FNAME}"
+SRC_DIR="${PMODULES_TMPDIR}/$P-$V/src"
+BUILD_DIR="${PMODULES_TMPDIR}/$P-$V/build"
+
+PATH="${PREFIX}/bin:${PATH}"
+
+trap "pb_exit" EXIT
+
+# download
+test -r "${SRC_FILE}" || curl -L --output "$_" "${DOWNLOAD_URL}" || exit ${PB_ERR_DOWNLOAD}
+
+# unpack
+mkdir -p "${SRC_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
+tar --directory "${SRC_DIR}" --strip-components 1 -xv -f "${SRC_FILE}" || exit ${PB_ERR_UNTAR}
+
+# configure
+mkdir -p "${BUILD_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
+case $(uname -s) in
+	Linux )
+		declare -x LIBS="-lz -lpthread"
+		;;
+	Darwin )
+		declare -x LIBS="-lz -framework CoreFoundation"
+		;;
+	* )
+		echo "Oops: unsupported OS!" 1>&2
+		exit ${PB_ERR_SYSTEM}
+		;;
+esac
+CPPFLAGS="-DUSE_INTERP_ERRORLINE" \
+"${SRC_DIR}"/configure \
+	--prefix="${PREFIX}" \
+	--exec-prefix="${PREFIX}" \
+	--with-module-path="${PREFIX%%/Tools*}/Tools/${PMODULES_MODULEFILES_DIR}" \
+	--with-tcl="${PREFIX}/lib" \
+	--without-x \
+	--disable-versioning \
+        || exit ${PB_ERR_CONFIGURE}
+
+# compile & install
+make -j ${NJOBS} || exit ${PB_ERR_MAKE}
+make install || exit ${PB_ERR_INSTALL}
+
+# post-install
+mkdir -p "${PREFIX}/share/man/man1"
+mkdir -p "${PREFIX}/share/man/man4"
+rm -v   "${PREFIX}/Modules/bin/add.modules"
+rm -v   "${PREFIX}/Modules/bin/mkroot"
+rm -rfv "${PREFIX}/Modules/modulefiles"
+mv -v   "${PREFIX}/Modules/share/man/man1/module.1" "${PREFIX}/share/man/man1"
+mv -v   "${PREFIX}/Modules/share/man/man4/modulefile.4" "${PREFIX}/share/man/man4"
+rmdir   "${PREFIX}/Modules/bin"
+rmdir   "${PREFIX}/Modules/share/man/man1"
+rmdir   "${PREFIX}/Modules/share/man/man4"
+rmdir   "${PREFIX}/Modules/share/man"
+rmdir   "${PREFIX}/Modules/share"
+rmdir   "${PREFIX}/Modules"
+rm -f	"${PREIX}/init/{ksh,perl.pm,python.py,ruby.rb,cmake,.modulespath}"
+cp -v   "${BUILD_DIR}/modulecmd" "${PREFIX}/libexec/modulecmd.bin" || exit 1
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
diff --git a/Tools/Tcl/build b/Tools/Tcl/build
deleted file mode 100755
index d1ceea6..0000000
--- a/Tools/Tcl/build
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env modbuild
-
-pbuild::set_download_url "https://prdownloads.sourceforge.net/tcl/tcl$V-src.tar.gz"
-pbuild::install_docfiles 'license.terms' 'README.md'
-
-pbuild::configure() {
-	case ${OS} in
-	Linux )
-		srcdir="${SRC_DIR}/unix"
-		;;
-	Darwin )
-		srcdir="${SRC_DIR}/macosx"
-		;;
-	esac
-	"${srcdir}"/configure \
-		--prefix="${PREFIX}" \
-		--bindir="${PREFIX}/${UTILBIN_DIR}" \
-		--enable-shared=no \
-		|| exit 1
-}
-
-pbuild::post_install() {
-	{ cd "${PREFIX}/${UTILBIN_DIR}" && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
-}
-
diff --git a/Tools/bash/build b/Tools/bash/build
deleted file mode 100755
index ff8489f..0000000
--- a/Tools/bash/build
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env modbuild
-
-pbuild::set_download_url "https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
-pbuild::add_configure_args "--bindir=${PREFIX}/${UTILBIN_DIR}" 
-
diff --git a/Tools/modules/build b/Tools/modules/build
deleted file mode 100755
index 14399de..0000000
--- a/Tools/modules/build
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env modbuild
-
-# use system gcc to compile
-declare -rx CC=gcc
-
-pbuild::set_download_url "https://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2"
-
-TCL_DIR="${PMODULES_HOME}"
-
-PATH="${TCL_DIR}/bin:${PATH}"
-
-pbuild::configure() {
-	case ${OS} in
-		Linux )
-			declare -x LIBS="-lz -lpthread"
-			;;
-		Darwin )
-			declare -x LIBS="-lz -framework CoreFoundation"
-			;;
-	esac
-	CPPFLAGS="-DUSE_INTERP_ERRORLINE" "${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		--exec-prefix="${PREFIX}" \
-		--with-module-path="${PMODULES_HOME%%/Tools*}/Tools/${PMODULES_MODULEFILES_DIR}" \
-		--with-tcl="${TCL_DIR}/lib" \
-		--without-x \
-		--disable-versioning \
-		|| exit 1
-}
-
-pbuild::post_install() {
-	rm -v   "${PREFIX}/Modules/bin/add.modules"
-	rm -v   "${PREFIX}/Modules/bin/mkroot"
-	rm -rfv "${PREFIX}/Modules/modulefiles"
-	mv -v   "${PREFIX}/Modules/share/man/man1/module.1 ${PREFIX}/share/man/man1"
-	mv -v   "${PREFIX}/Modules/share/man/man4/modulefile.4 ${PREFIX}/share/man/man4"
-	rmdir   "${PREFIX}/Modules/bin"
-	rmdir   "${PREFIX}/Modules/share/man/man1"
-	rmdir   "${PREFIX}/Modules/share/man/man4"
-	rmdir   "${PREFIX}/Modules/share/man"
-	rmdir   "${PREFIX}/Modules/share"
-	rmdir   "${PREFIX}/Modules"
-	rm -f	"${PREIX}/init/{ksh,perl.pm,python.py,ruby.rb,cmake,.modulespath}"
-	cp -v   "${BUILD_DIR}/modulecmd" "${PREFIX}/libexec/modulecmd.bin" || exit 1
-}
-	
-# fake module command
-module() {
-    :
-}
-
-# Local Variables:
-# mode: sh
-# sh-basic-offset: 8
-# tab-width: 8
-# End:
diff --git a/Tools/tcllib/build b/Tools/tcllib/build
deleted file mode 100755
index ea151ba..0000000
--- a/Tools/tcllib/build
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env modbuild
-
-pbuild::set_download_url "https://core.tcl-lang.org/tcllib/uv/$P-$V.tar.xz"
-
-
diff --git a/build b/build
index 21932ba..0646e56 100755
--- a/build
+++ b/build
@@ -29,6 +29,57 @@ declare -rx DEFAULT_TMPDIR='var/tmp/${USER}'
 # directory where the required tools will be installed (like bash, tclsh, etc)
 declare -rx UTILBIN_DIR='libexec'
 
+declare -ix PB_ERR_ARG=1
+declare -ix PB_ERR_SETUP=2
+declare -ix PB_ERR_SYSTEM=3
+declare -ix PB_ERR_DOWNLOAD=4
+declare -ix PB_ERR_UNTAR=5
+declare -ix PB_ERR_CONFIGURE=6
+declare -ix PB_ERR_MAKE=7
+declare -ix PB_ERR_PRE_INSTALL=8
+declare -ix PB_ERR_INSTALL=9
+declare -ix PB_ERR_POST_INSTALL=10
+declare -ix PB_ERR=255
+declare -ix NJOBS=4
+
+pb_exit() {
+        local -i ec=$?
+        if [[ -n "${BASH_VERSION}" ]]; then
+                local -i n=${#BASH_SOURCE[@]}
+                local -r recipe_name="${BASH_SOURCE[n]}"
+        else
+                local -r recipe_name="${ZSH_ARGZERO}"
+        fi
+        echo -n "${recipe_name}: "
+        if (( ec == 0 )); then
+                echo "done!"
+        elif (( ec == PB_ERR_ARG )); then
+                echo "argument error!"
+        elif (( ec == PB_ERR_SETUP )); then
+                echo "error in setting everything up!"
+        elif (( ec == PB_ERR_SYSTEM )); then
+                echo "unexpected system error!"
+        elif (( ec == PB_ERR_DOWNLOAD )); then
+                echo "error in downloading the source file!"
+        elif (( ec == PB_ERR_UNTAR )); then
+                echo "error in un-taring the source file!"
+        elif (( ec == PB_ERR_CONFIGURE )); then
+                echo "error in configuring the software!"
+        elif (( ec == PB_ERR_MAKE )); then
+                echo "error in compiling the software!"
+        elif (( ec == PB_ERR_PRE_INSTALL )); then
+                echo "error in pre-installing the software!"
+        elif (( ec == PB_ERR_INSTALL )); then
+                echo "error in installing the software!"
+        elif (( ec == PB_ERR_POST_INSTALL )); then
+                echo "error in post-installing the software!"
+        else
+                echo "oops, unknown error!!!"
+        fi
+        exit ${ec}
+}
+export -f pb_exit > /dev/null
+
 #-----------------------------------------------------------------------------
 #
 # Get version from config file.
@@ -354,27 +405,27 @@ pmodules::compile() {
 	fi
 
 	if [[ ! -f "${PMODULES_HOME}/${UTILBIN_DIR}/bash" ]] || [[ ${opt_force} == 'yes' ]]; then
-		build bash
+		./10-build-bash
 	fi
 
 	if [[ ! -e "${PMODULES_HOME}/${UTILBIN_DIR}/tclsh" ]] || [[ ${opt_force} == 'yes' ]]; then
-		build Tcl
+		./20-build-tcl
 	fi
 
 	if [[ ! -e "${PMODULES_HOME}/lib/tcllib1.20" ]] || [[ ${opt_force} == 'yes' ]]; then
-		build tcllib
+		./30-build-tcllib
 	fi
 
 	if [[ ! -e "${PMODULES_HOME}/libexec/modulecmd.bin" ]] || [[ ${opt_force} == 'yes' ]]; then
-		build modules
+		./40-build-modules
 	fi
-	rm -rf "${PMODULES_HOME}/include"
-	rm -rf "${PMODULES_HOME}/lib/"*.a
-	rm -rf "${PMODULES_HOME}/lib/"*.la
-	rm -rf "${PMODULES_HOME}/lib/bash"
-	rm -rf "${PMODULES_HOME}/lib/pkginfo"
-	rm -rf "${PMODULES_HOME}/man"
-	rm -rf "${PMODULES_HOME}/share"
+	#rm -rf "${PMODULES_HOME}/include"
+	#rm -rf "${PMODULES_HOME}/lib/"*.a
+	#rm -rf "${PMODULES_HOME}/lib/"*.la
+	#rm -rf "${PMODULES_HOME}/lib/bash"
+	#rm -rf "${PMODULES_HOME}/lib/pkginfo"
+	#rm -rf "${PMODULES_HOME}/man"
+	#rm -rf "${PMODULES_HOME}/share"
 
 	echo "Done..."
 }