diff --git a/scripts/Compiler/OpenBLAS/build b/scripts/Compiler/OpenBLAS/build
index 70cb8cb..0f664f5 100755
--- a/scripts/Compiler/OpenBLAS/build
+++ b/scripts/Compiler/OpenBLAS/build
@@ -1,9 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-
-pmodules.configure() {
+pbuild::configure() {
 	case ${COMPILER} in
 	gcc )
 		CC='gcc'
@@ -37,12 +34,12 @@ COMMON_PROF = -pg
 EOF
 }
 
-pmodules.build() {
+pbuild::build() {
 	cd "${MODULE_SRCDIR}"
 	make
 }
 
-pmodules.install() {
+pbuild::install() {
 	make PREFIX="${PREFIX}" install
 	# We have to build shared libs and remove them here.
 	# Building with NOSHARED gives an error during install -
@@ -52,10 +49,10 @@ pmodules.install() {
 	#( cd "${PREFIX}/lib"; ln -fs
 }
 
-pmodules.add_to_group 'Compiler'
-pmodules.set_runtime_dependencies "${COMPILER}"
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.set_docfiles 'LICENSE' 'README.md'
-pmodules.set_supported_compilers 'gcc' 'intel'
-pmodules.make_all
-pmodules.cleanup_src
+pbuild::add_to_group 'Compiler'
+pbuild::set_runtime_dependencies "${COMPILER}"
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::set_docfiles 'LICENSE' 'README.md'
+pbuild::set_supported_compilers 'gcc' 'intel'
+pbuild::make_all
+pbuild::cleanup_src
diff --git a/scripts/Compiler/OpenBLAS_OMP/build b/scripts/Compiler/OpenBLAS_OMP/build
index 72fdb1c..8a19ffc 100755
--- a/scripts/Compiler/OpenBLAS_OMP/build
+++ b/scripts/Compiler/OpenBLAS_OMP/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	cat <<EOF > "${MODULE_SRCDIR}/make.inc"
 SHELL = /bin/sh
 PLAT = 
@@ -25,12 +23,12 @@ COMMON_PROF = -pg
 EOF
 }
 
-pmodules.build() {
+pbuild::build() {
 	cd "${MODULE_SRCDIR}"
 	make
 }
 
-pmodules.install() {
+pbuild::install() {
 	make PREFIX="${PREFIX}" install
 	# We have to build shared libs and remove them here.
 	# Building with NOSHARED gives an error during install -
@@ -40,10 +38,10 @@ pmodules.install() {
 	#( cd "${PREFIX}/lib"; ln -fs
 }
 
-pmodules.add_to_group 'Compiler'
-pmodules.set_runtime_dependencies "${COMPILER}"
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.set_docfiles 'LICENSE' 'README.md'
-pmodules.set_supported_compilers 'gcc'
-pmodules.make_all
-pmodules.cleanup_src
+pbuild::add_to_group 'Compiler'
+pbuild::set_runtime_dependencies "${COMPILER}"
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::set_docfiles 'LICENSE' 'README.md'
+pbuild::set_supported_compilers 'gcc'
+pbuild::make_all
+pbuild::cleanup_src
diff --git a/scripts/Compiler/SuperLU/build b/scripts/Compiler/SuperLU/build
index 92e3f7d..1a22d82 100755
--- a/scripts/Compiler/SuperLU/build
+++ b/scripts/Compiler/SuperLU/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	cat <<EOF > "${MODULE_SRCDIR}/make.inc"
 PLAT		= 
 SuperLUroot 	= \${PREFIX}
@@ -28,21 +26,21 @@ CDEFS        = -DAdd_
 EOF
 }
 
-pmodules.build() {
+pbuild::build() {
 	cd "${MODULE_SRCDIR}"
 	mkdir -p "${PREFIX}/lib"
 	make
 }
 
-pmodules.install() {
+pbuild::install() {
 	make install
 	mkdir -p "${PREFIX}/include"
 	install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include"
 }
 
-pmodules.add_to_group 'Compiler'
-pmodules.set_runtime_dependencies "${COMPILER}"
-pmodules.set_build_dependencies "${COMPILER}" 'OpenBLAS'
-pmodules.set_docfiles 'README'
-pmodules.make_all
-pmodules.cleanup_src
+pbuild::add_to_group 'Compiler'
+pbuild::set_runtime_dependencies "${COMPILER}"
+pbuild::set_build_dependencies "${COMPILER}" 'OpenBLAS'
+pbuild::set_docfiles 'README'
+pbuild::make_all
+pbuild::cleanup_src
diff --git a/scripts/Compiler/UMFPACK/build b/scripts/Compiler/UMFPACK/build
index b42b3af..07c08c3 100755
--- a/scripts/Compiler/UMFPACK/build
+++ b/scripts/Compiler/UMFPACK/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	cat <<EOF > "${MODULE_SRCDIR}/SuiteSparse_config/SuiteSparse_config.mk"
 CF = \$(CFLAGS) \$(CPPFLAGS) \$(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
 RANLIB = ranlib
@@ -26,19 +24,19 @@ TBB =
 EOF
 }
 
-pmodules.build() {
+pbuild::build() {
 	cd "${MODULE_SRCDIR}/UMFPACK"
 	make TARGET=CORE2 BINARY=64 USE_THREAD=0 NO_SHARED=1
 }
 
-pmodules.install() {
+pbuild::install() {
 	install -d "${PREFIX}/include"
 	install -d "${PREFIX}/lib"
 	make PREFIX="${PREFIX}" install
 }
 
-pmodules.add_to_group 'Compiler'
-pmodules.set_runtime_dependencies "${COMPILER}" 'OpenBLAS'
-pmodules.set_build_dependencies "${COMPILER}" 'OpenBLAS'
-pmodules.make_all
-#pmodules.cleanup_src
+pbuild::add_to_group 'Compiler'
+pbuild::set_runtime_dependencies "${COMPILER}" 'OpenBLAS'
+pbuild::set_build_dependencies "${COMPILER}" 'OpenBLAS'
+pbuild::make_all
+#pbuild::cleanup_src
diff --git a/scripts/Compiler/atlas/build b/scripts/Compiler/atlas/build
index 2db157e..f3ac585 100755
--- a/scripts/Compiler/atlas/build
+++ b/scripts/Compiler/atlas/build
@@ -1,17 +1,15 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-pmodules.add_to_group 'Compiler'
-pmodules.set_runtime_dependencies "${COMPILER}"
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+pbuild::add_to_group 'Compiler'
+pbuild::set_runtime_dependencies "${COMPILER}"
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Compiler/boost/build b/scripts/Compiler/boost/build
index 6ba3d07..00cfcef 100755
--- a/scripts/Compiler/boost/build
+++ b/scripts/Compiler/boost/build
@@ -1,13 +1,11 @@
-#!/bin/bash
-
-source "$(dirname $0)/../../../lib/libpmodules.bash"
+#!/usr/bin/env modbuild
 
 # :TODO: detect compiler
 TOOLSET=intel-linux
 
 BOOST_BUILD_PATH="${MODULE_BUILDDIR}"
 
-pmodules.configure() {
+pbuild::configure() {
 	cd "${MODULE_SRCDIR}"
 	"${MODULE_SRCDIR}"/bootstrap.sh \
 		--prefix="${PREFIX}" \
@@ -17,7 +15,7 @@ pmodules.configure() {
 		|| exit 1
 }
 
-pmodules.build() {
+pbuild::build() {
 	cd "${MODULE_SRCDIR}"
 	./b2 \
 		--build-type=minimal \
@@ -30,7 +28,7 @@ pmodules.build() {
 		stage
 }
 
-pmodules.install() {
+pbuild::install() {
 	cd "${MODULE_SRCDIR}"
 	./b2 \
 		--build-type=minimal \
@@ -43,8 +41,8 @@ pmodules.install() {
 		install
 }
 
-pmodules.add_to_group 'Compiler'
-pmodules.set_runtime_dependencies "${COMPILER}"
-pmodules.set_build_dependencies "${COMPILER}" 'Python'
-pmodules.make_all
+pbuild::add_to_group 'Compiler'
+pbuild::set_runtime_dependencies "${COMPILER}"
+pbuild::set_build_dependencies "${COMPILER}" 'Python'
+pbuild::make_all
 
diff --git a/scripts/Compiler/gsl/build b/scripts/Compiler/gsl/build
index 8e9f07c..57ebb22 100755
--- a/scripts/Compiler/gsl/build
+++ b/scripts/Compiler/gsl/build
@@ -1,15 +1,13 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-pmodules.add_to_group 'Compiler'
-pmodules.set_docfiles \
+pbuild::add_to_group 'Compiler'
+pbuild::set_docfiles \
 	'AUTHORS' \
 	'BUGS' \
 	'COPYING' \
@@ -20,9 +18,9 @@ pmodules.set_docfiles \
 	'THANKS' \
 	'TODO'
 
-pmodules.set_runtime_dependencies "${COMPILER}"
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+pbuild::set_runtime_dependencies "${COMPILER}"
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Compiler/hdf5_serial/build b/scripts/Compiler/hdf5_serial/build
index 8c63690..355b352 100755
--- a/scripts/Compiler/hdf5_serial/build
+++ b/scripts/Compiler/hdf5_serial/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-shared \
@@ -12,8 +10,8 @@ pmodules.configure() {
 		|| exit 1
 }
 
-pmodules.add_to_group 'Compiler'
-pmodules.set_runtime_dependencies "${COMPILER}"
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+pbuild::add_to_group 'Compiler'
+pbuild::set_runtime_dependencies "${COMPILER}"
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
 
diff --git a/scripts/Compiler/mpich/build b/scripts/Compiler/mpich/build
index 454ba7c..4ff64cb 100755
--- a/scripts/Compiler/mpich/build
+++ b/scripts/Compiler/mpich/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	unset F90
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
@@ -12,8 +10,8 @@ pmodules.configure() {
 }
 
 
-pmodules.add_to_group 'Compiler'
-pmodules.set_runtime_dependencies "${COMPILER}"
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.set_docfiles 'COPYRIGHT' 'README'
-pmodules.make_all
+pbuild::add_to_group 'Compiler'
+pbuild::set_runtime_dependencies "${COMPILER}"
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::set_docfiles 'COPYRIGHT' 'README'
+pbuild::make_all
diff --git a/scripts/Compiler/root/build b/scripts/Compiler/root/build
index 0d53a70..e42ab8d 100755
--- a/scripts/Compiler/root/build
+++ b/scripts/Compiler/root/build
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-source "$(dirname $0)/../../../lib/libpmodules.bash"
+#!/usr/bin/env modbuild
 
 case ${OS} in
 Darwin )
@@ -12,7 +10,7 @@ Darwin )
 	;;
 esac
 
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--disable-ldap \
 		--disable-mysql \
@@ -27,11 +25,11 @@ pmodules.configure() {
 		|| exit 1
 }
 
-pmodules.build() {
+pbuild::build() {
 	make -j 4
 }
 
-pmodules.install() {
+pbuild::install() {
 	make clean
 
 	rm -f  Makefile
@@ -66,7 +64,7 @@ pmodules.install() {
 	mv "${PREFIX}/README"  "${DOCDIR}"
 }
 
-pmodules.add_to_group 'Compiler'
-pmodules.set_runtime_dependencies "${COMPILER}"
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+pbuild::add_to_group 'Compiler'
+pbuild::set_runtime_dependencies "${COMPILER}"
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
diff --git a/scripts/Compiler/vtk/build b/scripts/Compiler/vtk/build
index 108e9d7..e923a58 100755
--- a/scripts/Compiler/vtk/build
+++ b/scripts/Compiler/vtk/build
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 #
 # Notes:
 #   On Mac OS X VTK does not compile out of the box with self-compiled GCC.
@@ -6,11 +6,9 @@
 #   and remove these strings.
 #
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
 case ${OS} in
 Darwin )
-	pmodules.pre_configure() {
+	pbuild::pre_configure() {
 		# for the time being: on Mac OS X we need GL/gl.h from MacPorts:
 		std::append_path C_INLCUDE_PATH '/opt/local/include'
 		std::append_path CPLUS_INCLUDE_PATH '/opt/local/include'
@@ -18,7 +16,7 @@ Darwin )
 	;;
 esac
 
-pmodules.configure() {
+pbuild::configure() {
 	cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
 		-DVTK_INSTALL_INCLUDE_DIR:PATH=include \
 		-DVTK_INSTALL_LIB_DIR:PATH=lib \
@@ -26,8 +24,8 @@ pmodules.configure() {
 		"${MODULE_SRCDIR}"
 }
 
-pmodules.add_to_group 'Compiler'
-pmodules.set_runtime_dependencies "${COMPILER}"
-pmodules.set_build_dependencies 'cmake' "${COMPILER}"
-pmodules.make_all
+pbuild::add_to_group 'Compiler'
+pbuild::set_runtime_dependencies "${COMPILER}"
+pbuild::set_build_dependencies 'cmake' "${COMPILER}"
+pbuild::make_all
 
diff --git a/scripts/HDF5/H5hut/build b/scripts/HDF5/H5hut/build
index 7f5131f..cee3e9d 100755
--- a/scripts/HDF5/H5hut/build
+++ b/scripts/HDF5/H5hut/build
@@ -1,12 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.pre_configure() {
+pbuild::pre_configure() {
 	./autogen.sh
 }
 
-pmodules.configure() {
+pbuild::configure() {
 	CC=$MPICC
 	CXX=$MPICXX
 	F77=$MPIF77
@@ -23,20 +21,20 @@ pmodules.configure() {
 		|| exit 1
 }
 
-pmodules.build() {
+pbuild::build() {
 	make -C src
 	make -C tools 
 }
 
-pmodules.install() {
+pbuild::install() {
 	make -C src install
 	make -C tools install
 }
 
 
-pmodules.add_to_group 'HDF5'
-pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5'
-pmodules.set_build_dependencies   "autoconf" "automake" "libtool" "${COMPILER}" "${MPI}" "hdf5"
-pmodules.set_docfiles 'AUTHORS' 'COPYING'
-pmodules.make_all
+pbuild::add_to_group 'HDF5'
+pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5'
+pbuild::set_build_dependencies   "autoconf" "automake" "libtool" "${COMPILER}" "${MPI}" "hdf5"
+pbuild::set_docfiles 'AUTHORS' 'COPYING'
+pbuild::make_all
 
diff --git a/scripts/HDF5/netcdf/build b/scripts/HDF5/netcdf/build
index 3d3e819..b013a6f 100755
--- a/scripts/HDF5/netcdf/build
+++ b/scripts/HDF5/netcdf/build
@@ -1,12 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.pre_configure() {
+pbuild::pre_configure() {
 	:
 }
 
-pmodules.configure() {
+pbuild::configure() {
 	CC=$MPICC
 	CXX=$MPICXX
 	F77=$MPIF77
@@ -20,9 +18,9 @@ pmodules.configure() {
 		|| exit 1
 }
 
-pmodules.add_to_group 'HDF5'
-pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5'
-pmodules.set_build_dependencies   "${COMPILER}" "${MPI}" 'hdf5'
-pmodules.set_docfiles 'COPYRIGHT' 'README.md' 'RELEASE_NOTES.md'
-pmodules.make_all
+pbuild::add_to_group 'HDF5'
+pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5'
+pbuild::set_build_dependencies   "${COMPILER}" "${MPI}" 'hdf5'
+pbuild::set_docfiles 'COPYRIGHT' 'README.md' 'RELEASE_NOTES.md'
+pbuild::make_all
 
diff --git a/scripts/HDF5_serial/H5hut_serial/build b/scripts/HDF5_serial/H5hut_serial/build
index 7e94ee6..8651506 100755
--- a/scripts/HDF5_serial/H5hut_serial/build
+++ b/scripts/HDF5_serial/H5hut_serial/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	(cd "${MODULE_SRCDIR}" && ./autogen.sh)
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
@@ -13,18 +11,18 @@ pmodules.configure() {
 		|| exit 1
 }
 
-pmodules.build() {
+pbuild::build() {
 	make -C src
 	make -C tools 
 }
 
-pmodules.install() {
+pbuild::install() {
 	make -C src install
 	make -C tools install
 }
 
-pmodules.add_to_group 'HDF5_serial'
-pmodules.set_runtime_dependencies "${COMPILER}" 'hdf5_serial'
-pmodules.set_build_dependencies   "autoconf" "automake" "libtool" "${COMPILER}" "vtk" "hdf5_serial"
-pmodules.make_all
+pbuild::add_to_group 'HDF5_serial'
+pbuild::set_runtime_dependencies "${COMPILER}" 'hdf5_serial'
+pbuild::set_build_dependencies   "autoconf" "automake" "libtool" "${COMPILER}" "vtk" "hdf5_serial"
+pbuild::make_all
 
diff --git a/scripts/Libraries/gmp/build b/scripts/Libraries/gmp/build
index 90a3c4a..27d52b8 100755
--- a/scripts/Libraries/gmp/build
+++ b/scripts/Libraries/gmp/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--disable-shared \
@@ -13,6 +11,6 @@ pmodules.configure() {
 declare -rx CC=gcc
 declare -rx CPP=/usr/bin/cpp
 
-pmodules.add_to_group 'Libraries'
-pmodules.make_all
+pbuild::add_to_group 'Libraries'
+pbuild::make_all
 
diff --git a/scripts/Libraries/libungif/build b/scripts/Libraries/libungif/build
index 616cc8b..29e2c92 100755
--- a/scripts/Libraries/libungif/build
+++ b/scripts/Libraries/libungif/build
@@ -1,13 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-pmodules.add_to_group 'Libraries'
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+pbuild::add_to_group 'Libraries'
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
diff --git a/scripts/Libraries/mpc/build b/scripts/Libraries/mpc/build
index 142bfae..e28adf0 100755
--- a/scripts/Libraries/mpc/build
+++ b/scripts/Libraries/mpc/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-gmp=$GMP_PREFIX \
@@ -15,7 +13,7 @@ pmodules.configure() {
 declare -rx CC=gcc
 
 module use 'Libraries'
-pmodules.add_to_group 'Libraries'
-pmodules.set_build_dependencies 'gmp' 'mpfr'
-pmodules.make_all
+pbuild::add_to_group 'Libraries'
+pbuild::set_build_dependencies 'gmp' 'mpfr'
+pbuild::make_all
 
diff --git a/scripts/Libraries/mpfr/build b/scripts/Libraries/mpfr/build
index 5b2e975..7f6a158 100755
--- a/scripts/Libraries/mpfr/build
+++ b/scripts/Libraries/mpfr/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-gmp=$GMP_PREFIX \
@@ -15,6 +13,6 @@ declare -rx CC=gcc
 
 module use 'Libraries'
 
-pmodules.add_to_group 'Libraries'
-pmodules.set_build_dependencies 'gmp'
-pmodules.make_all
+pbuild::add_to_group 'Libraries'
+pbuild::set_build_dependencies 'gmp'
+pbuild::make_all
diff --git a/scripts/Libraries/tiff/build b/scripts/Libraries/tiff/build
index 616cc8b..29e2c92 100755
--- a/scripts/Libraries/tiff/build
+++ b/scripts/Libraries/tiff/build
@@ -1,13 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-pmodules.add_to_group 'Libraries'
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+pbuild::add_to_group 'Libraries'
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
diff --git a/scripts/MPI/BoxLib/build b/scripts/MPI/BoxLib/build
index 3bbefe5..55ffa86 100755
--- a/scripts/MPI/BoxLib/build
+++ b/scripts/MPI/BoxLib/build
@@ -1,18 +1,16 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	CC=$MPICC CXX=$MPICXX cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
 		"${MODULE_SRCDIR}"
 }
 
-pmodules.add_to_group 'MPI'
-pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
-pmodules.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}"
-pmodules.set_docfiles 'license.txt' 'README.txt'
-pmodules.make_all
+pbuild::add_to_group 'MPI'
+pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}"
+pbuild::set_build_dependencies 'cmake' "${COMPILER}" "${MPI}"
+pbuild::set_docfiles 'license.txt' 'README.txt'
+pbuild::make_all
 
 
diff --git a/scripts/MPI/OPAL.14/build b/scripts/MPI/OPAL.14/build
index 6b06543..1ed1be2 100755
--- a/scripts/MPI/OPAL.14/build
+++ b/scripts/MPI/OPAL.14/build
@@ -1,14 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
 P='OPAL'
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-
 module use unstable
 
 # add -fopenmp to CC and CXX, if you want to compile with OpenMP
-pmodules.configure() {
+pbuild::configure() {
 	cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
@@ -16,9 +13,9 @@ pmodules.configure() {
 		"${MODULE_SRCDIR}"
 }
 
-pmodules.add_to_group 'MPI'
-pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
-pmodules.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'gsl'
-pmodules.set_supported_compilers 'gcc/4.7' 'gcc/4.8'
-pmodules.make_all
+pbuild::add_to_group 'MPI'
+pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}"
+pbuild::set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'gsl'
+pbuild::set_supported_compilers 'gcc/4.7' 'gcc/4.8'
+pbuild::make_all
 
diff --git a/scripts/MPI/OPAL/build b/scripts/MPI/OPAL/build
index 59d9408..c857221 100755
--- a/scripts/MPI/OPAL/build
+++ b/scripts/MPI/OPAL/build
@@ -1,11 +1,9 @@
-#!/bin/bash
-
-source "$(dirname $0)/../../../lib/libpmodules.bash"
+#!/usr/bin/env modbuild
 
 module use unstable
 
 # add -fopenmp to CC and CXX, if you want to compile with OpenMP
-pmodules.configure() {
+pbuild::configure() {
 	cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
@@ -13,9 +11,9 @@ pmodules.configure() {
 		"${MODULE_SRCDIR}"
 }
 
-pmodules.add_to_group 'MPI'
-pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
-pmodules.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'ippl' 'gsl'
-pmodules.set_supported_compilers 'gcc/4.7' 'gcc/4.8'
-pmodules.make_all
+pbuild::add_to_group 'MPI'
+pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}"
+pbuild::set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'ippl' 'gsl'
+pbuild::set_supported_compilers 'gcc/4.7' 'gcc/4.8'
+pbuild::make_all
 
diff --git a/scripts/MPI/SuperLU_DIST/build b/scripts/MPI/SuperLU_DIST/build
index f9b503d..e71ee8c 100755
--- a/scripts/MPI/SuperLU_DIST/build
+++ b/scripts/MPI/SuperLU_DIST/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	case ${COMPILER} in
 	gcc )
 		LOADER='mpif90'
@@ -38,22 +36,22 @@ CDEFS        = -DAdd__
 EOF
 }
 
-pmodules.build() {
+pbuild::build() {
 	cd "${MODULE_SRCDIR}"
 	mkdir -p "${PREFIX}/lib"
 	make
 }
 
-pmodules.install() {
+pbuild::install() {
 	make install
 	mkdir -p "${PREFIX}/include"
 	install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include"
 }
 
 
-pmodules.add_to_group 'MPI'
-pmodules.set_runtime_dependencies "${COMPILER}" "${MPI} 'OpenBLAS' 'parmetis'"
-pmodules.set_build_dependencies "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis'
-pmodules.set_docfiles 'README'
-pmodules.make_all
-pmodules.cleanup_src
+pbuild::add_to_group 'MPI'
+pbuild::set_runtime_dependencies "${COMPILER}" "${MPI} 'OpenBLAS' 'parmetis'"
+pbuild::set_build_dependencies "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis'
+pbuild::set_docfiles 'README'
+pbuild::make_all
+pbuild::cleanup_src
diff --git a/scripts/MPI/cpmd/build b/scripts/MPI/cpmd/build
index 49821b8..6f4f9a1 100755
--- a/scripts/MPI/cpmd/build
+++ b/scripts/MPI/cpmd/build
@@ -1,19 +1,17 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	cp "${BUILDSCRIPT_DIR}/Makefile" "${MODULE_BUILDDIR}"		|| exit 1
 	cp "${MODULE_SRCDIR}/irat.inc" "${MODULE_BUILDDIR}"	|| exit 1
 }
 
-pmodules.install() {
+pbuild::install() {
 	mkdir -p "${PREFIX}/bin"
 	cp "${MODULE_BUILDDIR}/cpmd.x" "${PREFIX}/bin"
 }
 
-pmodules.add_to_group 'MPI'
-pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
-pmodules.set_build_dependencies "${COMPILER}" "${MPI}"
-pmodules.make_all
+pbuild::add_to_group 'MPI'
+pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}"
+pbuild::set_build_dependencies "${COMPILER}" "${MPI}"
+pbuild::make_all
 
diff --git a/scripts/MPI/gromacs/build b/scripts/MPI/gromacs/build
index 4510b13..d97f124 100755
--- a/scripts/MPI/gromacs/build
+++ b/scripts/MPI/gromacs/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
@@ -14,12 +12,12 @@ pmodules.configure() {
 }
 
 
-pmodules.add_to_group 'MPI'
-pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
-pmodules.set_build_dependencies "${COMPILER}" "${MPI}" cmake
-pmodules.set_docfiles \
+pbuild::add_to_group 'MPI'
+pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}"
+pbuild::set_build_dependencies "${COMPILER}" "${MPI}" cmake
+pbuild::set_docfiles \
 		AUTHORS \
 		COPYING \
 		README
-pmodules.make_all
+pbuild::make_all
 
diff --git a/scripts/MPI/ippl/build b/scripts/MPI/ippl/build
index 0ef2e87..2c4d9e5 100755
--- a/scripts/MPI/ippl/build
+++ b/scripts/MPI/ippl/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	CC=$MPICC
 	CXX=$MPICXX
 	F77=$MPIF77
@@ -18,9 +16,9 @@ pmodules.configure() {
 		|| exit 1 
 }
 
-pmodules.add_to_group 'MPI'
-pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
-pmodules.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}"
-pmodules.set_docfiles LICENSE README
-pmodules.make_all
+pbuild::add_to_group 'MPI'
+pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}"
+pbuild::set_build_dependencies 'cmake' "${COMPILER}" "${MPI}"
+pbuild::set_docfiles LICENSE README
+pbuild::make_all
 
diff --git a/scripts/MPI/parmetis/build b/scripts/MPI/parmetis/build
index 5155065..4629a50 100755
--- a/scripts/MPI/parmetis/build
+++ b/scripts/MPI/parmetis/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	CC=$MPICC
 	CXX=$MPICXX
 	F77=$MPIF77
@@ -11,7 +9,7 @@ pmodules.configure() {
 	FORTRAN=$MPIFORTRAN
 }
 
-pmodules.build() {
+pbuild::build() {
 	local -ri MAJOR_VERSION=${V%%.*}
 	if (( MAJOR_VERSION == 3 )) ; then
 		cd "${MODULE_SRCDIR}"
@@ -39,15 +37,15 @@ pmodules.build() {
 	fi
 }
 
-pmodules.install() {
+pbuild::install() {
 	:
 }
 
 
-pmodules.add_to_group 'MPI'
-pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
-pmodules.set_build_dependencies "${COMPILER}" "${MPI}"
-pmodules.set_docfiles 'CHANGES' 'INSTALL' 'LICENSE.txt' 'README' 'VERSION' 
-pmodules.make_all
-pmodules.cleanup_src
+pbuild::add_to_group 'MPI'
+pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}"
+pbuild::set_build_dependencies "${COMPILER}" "${MPI}"
+pbuild::set_docfiles 'CHANGES' 'INSTALL' 'LICENSE.txt' 'README' 'VERSION' 
+pbuild::make_all
+pbuild::cleanup_src
 
diff --git a/scripts/MPI/trilinos/build b/scripts/MPI/trilinos/build
index f6c4a67..e786e77 100755
--- a/scripts/MPI/trilinos/build
+++ b/scripts/MPI/trilinos/build
@@ -1,10 +1,8 @@
-#!/bin/bash
-
-source "$(dirname $0)/../../../lib/libpmodules.bash"
+#!/usr/bin/env modbuild
 
 declare -rx AR=ar
 
-pmodules.configure() {
+pbuild::configure() {
 	BLAS_PREFIX=$OPENBLAS_PREFIX
 	LAPACK_PREFIX=$OPENBLAS_PREFIX
 
@@ -64,9 +62,9 @@ pmodules.configure() {
            "${MODULE_SRCDIR}" || exit 1
 }
 
-pmodules.add_to_group 'MPI'
-pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis'
-pmodules.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis'
-pmodules.set_docfiles Copyright.txt LICENSE README RELEASE_NOTES
-pmodules.make_all
+pbuild::add_to_group 'MPI'
+pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis'
+pbuild::set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis'
+pbuild::set_docfiles Copyright.txt LICENSE README RELEASE_NOTES
+pbuild::make_all
 
diff --git a/scripts/OPAL/opt-pilot/build b/scripts/OPAL/opt-pilot/build
index b2a2bcf..e403851 100755
--- a/scripts/OPAL/opt-pilot/build
+++ b/scripts/OPAL/opt-pilot/build
@@ -1,20 +1,18 @@
-#!/bin/bash
-
-source "$(dirname $0)/../../../lib/libpmodules.bash"
+#!/usr/bin/env modbuild
 
 module use unstable
 
 # add -fopenmp to CC and CXX, if you want to compile with OpenMP
-pmodules.configure() {
+pbuild::configure() {
 	cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
 		"${MODULE_SRCDIR}"
 }
 
-pmodules.add_to_group 'OPAL'
-pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
-pmodules.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'gsl' 'boost' 'OPAL'
-pmodules.set_supported_compilers 'gcc/4.8'
-pmodules.make_all
+pbuild::add_to_group 'OPAL'
+pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}"
+pbuild::set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'gsl' 'boost' 'OPAL'
+pbuild::set_supported_compilers 'gcc/4.8'
+pbuild::make_all
 
diff --git a/scripts/Programming/Python/build b/scripts/Programming/Python/build
index 76ee418..e17efa2 100755
--- a/scripts/Programming/Python/build
+++ b/scripts/Programming/Python/build
@@ -1,21 +1,19 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-pmodules.post_install() {
+pbuild::post_install() {
 	ln -fs "${PREFIX}/bin/python${V%%.*}" "${PREFIX}/bin/python"
 	ln -fs "${PREFIX}/include/python${V%.*}m" "${PREFIX}/include/python"
 	ln -fs "${PREFIX}/include/python${V%.*}m" "${PREFIX}/include/python${V%.*}"
 }
 
-pmodules.add_to_group 'Programming'
-pmodules.set_runtime_dependencies ""
-pmodules.set_build_dependencies   "${COMPILER}"
-pmodules.make_all
+pbuild::add_to_group 'Programming'
+pbuild::set_runtime_dependencies ""
+pbuild::set_build_dependencies   "${COMPILER}"
+pbuild::make_all
 
diff --git a/scripts/Programming/Tcl/build b/scripts/Programming/Tcl/build
index 83d6aa4..43c6e71 100755
--- a/scripts/Programming/Tcl/build
+++ b/scripts/Programming/Tcl/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	case ${OS} in
 	Linux )
 		srcdir="${MODULE_SRCDIR}/unix"
@@ -17,13 +15,13 @@ pmodules.configure() {
 		|| exit 1
 }
 
-pmodules.post_install() {
+pbuild::post_install() {
 	{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
 }
 
 # use system's cc
 declare CC=cc
 
-pmodules.add_to_group 'Programming'
-pmodules.set_docfiles 'license.terms' 'README'
-pmodules.make_all
+pbuild::add_to_group 'Programming'
+pbuild::set_docfiles 'license.terms' 'README'
+pbuild::make_all
diff --git a/scripts/Programming/Tk/build b/scripts/Programming/Tk/build
index dad9c60..3a4efa3 100755
--- a/scripts/Programming/Tk/build
+++ b/scripts/Programming/Tk/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	case ${OS} in
 	Linux )
 		srcdir="${MODULE_SRCDIR}/unix"
@@ -18,7 +16,7 @@ pmodules.configure() {
 		|| exit 1
 }
 
-pmodules.post_install() {
+pbuild::post_install() {
 	:
 	#{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
 }
@@ -26,7 +24,7 @@ pmodules.post_install() {
 # use system's cc
 declare CC=cc
 
-pmodules.add_to_group 'Programming'
-pmodules.set_build_dependencies 'Tcl'
-pmodules.set_docfiles 'license.terms' 'README'
-pmodules.make_all
+pbuild::add_to_group 'Programming'
+pbuild::set_build_dependencies 'Tcl'
+pbuild::set_docfiles 'license.terms' 'README'
+pbuild::make_all
diff --git a/scripts/Programming/autoconf/build b/scripts/Programming/autoconf/build
index 7b13e21..5b952ff 100755
--- a/scripts/Programming/autoconf/build
+++ b/scripts/Programming/autoconf/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
@@ -11,8 +9,8 @@ pmodules.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-pmodules.add_to_group 'Programming'
-pmodules.set_docfiles \
+pbuild::add_to_group 'Programming'
+pbuild::set_docfiles \
 	AUTHORS \
 	COPYING \
 	COPYING.EXCEPTION \
@@ -21,8 +19,8 @@ pmodules.set_docfiles \
 	README \
 	THANKS
 
-pmodules.set_build_dependencies "m4"
-pmodules.make_all
+pbuild::set_build_dependencies "m4"
+pbuild::make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Programming/automake/build b/scripts/Programming/automake/build
index 2081002..b863a25 100755
--- a/scripts/Programming/automake/build
+++ b/scripts/Programming/automake/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
@@ -11,8 +9,8 @@ pmodules.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-pmodules.add_to_group 'Programming'
-pmodules.set_docfiles \
+pbuild::add_to_group 'Programming'
+pbuild::set_docfiles \
 	AUTHORS \
 	COPYING \
 	ChangeLog \
@@ -20,8 +18,8 @@ pmodules.set_docfiles \
 	NEWS \
 	README \
 	THANKS
-pmodules.set_build_dependencies 'm4' 'autoconf'
-pmodules.make_all
+pbuild::set_build_dependencies 'm4' 'autoconf'
+pbuild::make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Programming/binutils/build b/scripts/Programming/binutils/build
index 441b0ed..d4d39ca 100755
--- a/scripts/Programming/binutils/build
+++ b/scripts/Programming/binutils/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
@@ -11,6 +9,6 @@ pmodules.configure() {
 # use system gcc to compile
 #declare -rx CC=gcc
 
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.add_to_group 'Programming'
-pmodules.make_all
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::add_to_group 'Programming'
+pbuild::make_all
diff --git a/scripts/Programming/cmake/build b/scripts/Programming/cmake/build
index 793ee7d..e3519ae 100755
--- a/scripts/Programming/cmake/build
+++ b/scripts/Programming/cmake/build
@@ -1,12 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}/bootstrap" --prefix="${PREFIX}"
 }
 
-pmodules.add_to_group 'Programming'
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+pbuild::add_to_group 'Programming'
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
 
diff --git a/scripts/Programming/gcc/build b/scripts/Programming/gcc/build
index 2a51857..70f6c1c 100755
--- a/scripts/Programming/gcc/build
+++ b/scripts/Programming/gcc/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-languages=c,c++,objc,obj-c++,lto,fortran \
@@ -21,8 +19,8 @@ declare -rx CC=gcc
 declare -rx CXX=g++
 
 module use 'Libraries'
-pmodules.add_to_group 'Programming'
-pmodules.set_build_dependencies 'gmp' 'mpfr' 'mpc'
-pmodules.set_docfiles 'COPYING' 'COPYING.LIB' 'COPYING.RUNTIME' 'COPYING3' 'COPYING3.LIB' 'NEWS' 'README'
-pmodules.make_all
+pbuild::add_to_group 'Programming'
+pbuild::set_build_dependencies 'gmp' 'mpfr' 'mpc'
+pbuild::set_docfiles 'COPYING' 'COPYING.LIB' 'COPYING.RUNTIME' 'COPYING3' 'COPYING3.LIB' 'NEWS' 'README'
+pbuild::make_all
 
diff --git a/scripts/Programming/gtest/build b/scripts/Programming/gtest/build
index 12c3c86..c128e37 100755
--- a/scripts/Programming/gtest/build
+++ b/scripts/Programming/gtest/build
@@ -1,9 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.add_to_group 'Programming'
-pmodules.set_runtime_dependencies ""
-pmodules.set_build_dependencies   "${COMPILER}"
-pmodules.make_all
+pbuild::add_to_group 'Programming'
+pbuild::set_runtime_dependencies ""
+pbuild::set_build_dependencies   "${COMPILER}"
+pbuild::make_all
 
diff --git a/scripts/Programming/libtool/build b/scripts/Programming/libtool/build
index 62a4531..7801af1 100755
--- a/scripts/Programming/libtool/build
+++ b/scripts/Programming/libtool/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
@@ -11,8 +9,8 @@ pmodules.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-pmodules.add_to_group 'Programming'
-pmodules.set_docfiles 'AUTHORS' 'COPYING' 'NEWS' 'README' 'THANKS'
-pmodules.set_build_dependencies 'autoconf' 'automake'
-pmodules.make_all
+pbuild::add_to_group 'Programming'
+pbuild::set_docfiles 'AUTHORS' 'COPYING' 'NEWS' 'README' 'THANKS'
+pbuild::set_build_dependencies 'autoconf' 'automake'
+pbuild::make_all
 
diff --git a/scripts/Programming/m4/build b/scripts/Programming/m4/build
index ad5a34b..e9230aa 100755
--- a/scripts/Programming/m4/build
+++ b/scripts/Programming/m4/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
@@ -11,5 +9,5 @@ pmodules.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-pmodules.add_to_group 'Programming'
-pmodules.make_all
+pbuild::add_to_group 'Programming'
+pbuild::make_all
diff --git a/scripts/Programming/psi-python27/build b/scripts/Programming/psi-python27/build
index 5eba966..5e6ab6e 100755
--- a/scripts/Programming/psi-python27/build
+++ b/scripts/Programming/psi-python27/build
@@ -1,19 +1,17 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	:
 }
 
-pmodules.build() {
+pbuild::build() {
 	:
 }
 
-pmodules.install() {
+pbuild::install() {
 	cd "${MODULE_SRCDIR}"
 	rsync --exclude=".info" --delete --verbose --archive . "${PREFIX}"
 }
 
-pmodules.add_to_group 'Programming'
-pmodules.make_all
+pbuild::add_to_group 'Programming'
+pbuild::make_all
diff --git a/scripts/System/filebench/build b/scripts/System/filebench/build
index 7933b19..e808006 100755
--- a/scripts/System/filebench/build
+++ b/scripts/System/filebench/build
@@ -1,14 +1,12 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-pmodules.supported_os 'Linux'
-pmodules.add_to_group 'System'
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+pbuild::supported_os 'Linux'
+pbuild::add_to_group 'System'
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
diff --git a/scripts/System/fsstress/build b/scripts/System/fsstress/build
index b90e910..ef35e01 100755
--- a/scripts/System/fsstress/build
+++ b/scripts/System/fsstress/build
@@ -1,24 +1,22 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	:
 }
 
-pmodules.build() {
+pbuild::build() {
         cd "${MODULE_SRCDIR}"
 
 	make -j ${JOBS}
 }
 
-pmodules.install() {
+pbuild::install() {
         cd "${MODULE_SRCDIR}"
 	mkdir -p ${PREFIX}/bin
 	install -m 0755 fsstress "${PREFIX}/bin"
 }
 
-#pmodules.supported_os 'Linux'
-pmodules.add_to_group 'System'
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+#pbuild::supported_os 'Linux'
+pbuild::add_to_group 'System'
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
diff --git a/scripts/System/mdtest/build b/scripts/System/mdtest/build
index 3b76759..9b8d4d8 100755
--- a/scripts/System/mdtest/build
+++ b/scripts/System/mdtest/build
@@ -1,24 +1,22 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	:
 }
 
-pmodules.build() {
+pbuild::build() {
         cd "${MODULE_SRCDIR}"
 
 	make -j ${JOBS}
 }
 
-pmodules.install() {
+pbuild::install() {
         cd "${MODULE_SRCDIR}"
 	mkdir -p ${PREFIX}/bin
 	install -m 0755 mdtest "${PREFIX}/bin"
 }
 
-#pmodules.supported_os 'Linux'
-pmodules.add_to_group 'System'
-pmodules.set_build_dependencies "${COMPILER}" "${MPI}"
-pmodules.make_all
+#pbuild::supported_os 'Linux'
+pbuild::add_to_group 'System'
+pbuild::set_build_dependencies "${COMPILER}" "${MPI}"
+pbuild::make_all
diff --git a/scripts/System/nmap/build b/scripts/System/nmap/build
index 608ee20..3e540a9 100755
--- a/scripts/System/nmap/build
+++ b/scripts/System/nmap/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	cd "${MODULE_SRCDIR}"
 	./configure \
 		--prefix="${PREFIX}" \
@@ -13,16 +11,16 @@ pmodules.configure() {
 		--with-liblinear=included
 }
 
-pmodules.build() {
+pbuild::build() {
 	cd "${MODULE_SRCDIR}"
 	make -j "${JOBS}"
 }
 
-pmodules.install() {
+pbuild::install() {
 	cd "${MODULE_SRCDIR}"
 	make install
 }
 
-pmodules.add_to_group 'System'
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+pbuild::add_to_group 'System'
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
diff --git a/scripts/System/patchelf/build b/scripts/System/patchelf/build
index 7933b19..e808006 100755
--- a/scripts/System/patchelf/build
+++ b/scripts/System/patchelf/build
@@ -1,14 +1,12 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-pmodules.supported_os 'Linux'
-pmodules.add_to_group 'System'
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+pbuild::supported_os 'Linux'
+pbuild::add_to_group 'System'
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
diff --git a/scripts/System/unison/build b/scripts/System/unison/build
index 1a15abd..c23dfd0 100755
--- a/scripts/System/unison/build
+++ b/scripts/System/unison/build
@@ -1,26 +1,24 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	:
 }
 
-pmodules.build() {
+pbuild::build() {
 	cd "${MODULE_SRCDIR}"
 	make
 }
 
-pmodules.install() {
+pbuild::install() {
 	cd "${MODULE_SRCDIR}"
 	install -m 0755 -d "${PREFIX}/bin"
 	install -m 0755 unison "${PREFIX}/bin"
 }
 
-pmodules.add_to_group 'System'
-pmodules.set_docfiles 'BUGS.txt' 'CONTRIB' 'COPYING' 'NEWS' 'README'
-#pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+pbuild::add_to_group 'System'
+pbuild::set_docfiles 'BUGS.txt' 'CONTRIB' 'COPYING' 'NEWS' 'README'
+#pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Tools/global/build b/scripts/Tools/global/build
index 14d2516..7559a60 100755
--- a/scripts/Tools/global/build
+++ b/scripts/Tools/global/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-pic=yes \
@@ -10,10 +8,10 @@ pmodules.configure() {
 		|| exit 1
 }
 
-pmodules.add_to_group 'Tools'
-pmodules.set_docfiles 'AUTHORS' 'COPYING' 'COPYING.LIB' 'LICENSE' 'README' 'THANKS'
-pmodules.set_build_dependencies "gcc/4.8.3"
-pmodules.make_all
+pbuild::add_to_group 'Tools'
+pbuild::set_docfiles 'AUTHORS' 'COPYING' 'COPYING.LIB' 'LICENSE' 'README' 'THANKS'
+pbuild::set_build_dependencies "gcc/4.8.3"
+pbuild::make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Tools/gnuplot/build b/scripts/Tools/gnuplot/build
index 5f18b21..1fd2631 100755
--- a/scripts/Tools/gnuplot/build
+++ b/scripts/Tools/gnuplot/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-gif=no \
@@ -10,10 +8,10 @@ pmodules.configure() {
 		|| exit 1
 }
 
-pmodules.add_to_group 'Tools'
-pmodules.set_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README'
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+pbuild::add_to_group 'Tools'
+pbuild::set_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README'
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
 
 # Local Variables:
 # mode: sh