diff --git a/config/Compiler.conf b/config/Compiler.conf
new file mode 120000
index 0000000..4d33b43
--- /dev/null
+++ b/config/Compiler.conf
@@ -0,0 +1 @@
+gcc-4.7.3
\ No newline at end of file
diff --git a/config/Compiler.d/Compiler.conf b/config/Compiler.d/Compiler.conf
new file mode 120000
index 0000000..78de1d9
--- /dev/null
+++ b/config/Compiler.d/Compiler.conf
@@ -0,0 +1 @@
+../Compiler.conf
\ No newline at end of file
diff --git a/config/compiler.d/compiler.conf b/config/Compiler.d/compiler.conf
similarity index 100%
rename from config/compiler.d/compiler.conf
rename to config/Compiler.d/compiler.conf
diff --git a/config/compiler.d/mpi.conf b/config/Compiler.d/mpi.conf
similarity index 100%
rename from config/compiler.d/mpi.conf
rename to config/Compiler.d/mpi.conf
diff --git a/config/HDF5.conf b/config/HDF5.conf
new file mode 120000
index 0000000..b568be6
--- /dev/null
+++ b/config/HDF5.conf
@@ -0,0 +1 @@
+hdf5-1.8.12
\ No newline at end of file
diff --git a/config/HDF5.d/Compiler.conf b/config/HDF5.d/Compiler.conf
new file mode 120000
index 0000000..78de1d9
--- /dev/null
+++ b/config/HDF5.d/Compiler.conf
@@ -0,0 +1 @@
+../Compiler.conf
\ No newline at end of file
diff --git a/config/HDF5.d/HDF5.conf b/config/HDF5.d/HDF5.conf
new file mode 120000
index 0000000..32f1dae
--- /dev/null
+++ b/config/HDF5.d/HDF5.conf
@@ -0,0 +1 @@
+../HDF5.conf
\ No newline at end of file
diff --git a/config/HDF5.d/MPI.conf b/config/HDF5.d/MPI.conf
new file mode 120000
index 0000000..e3cfc7a
--- /dev/null
+++ b/config/HDF5.d/MPI.conf
@@ -0,0 +1 @@
+../MPI.conf
\ No newline at end of file
diff --git a/config/core.d/compiler.conf b/config/HDF5_serial.d/compiler.conf
similarity index 100%
rename from config/core.d/compiler.conf
rename to config/HDF5_serial.d/compiler.conf
diff --git a/config/hdf5_serial.d/hdf5.conf b/config/HDF5_serial.d/hdf5.conf
similarity index 100%
rename from config/hdf5_serial.d/hdf5.conf
rename to config/HDF5_serial.d/hdf5.conf
diff --git a/config/MPI.conf b/config/MPI.conf
new file mode 120000
index 0000000..c840704
--- /dev/null
+++ b/config/MPI.conf
@@ -0,0 +1 @@
+openmpi-1.6.5
\ No newline at end of file
diff --git a/config/MPI.d/Compiler.conf b/config/MPI.d/Compiler.conf
new file mode 120000
index 0000000..78de1d9
--- /dev/null
+++ b/config/MPI.d/Compiler.conf
@@ -0,0 +1 @@
+../Compiler.conf
\ No newline at end of file
diff --git a/config/MPI.d/HDF5.conf b/config/MPI.d/HDF5.conf
new file mode 120000
index 0000000..32f1dae
--- /dev/null
+++ b/config/MPI.d/HDF5.conf
@@ -0,0 +1 @@
+../HDF5.conf
\ No newline at end of file
diff --git a/config/MPI.d/MPI.conf b/config/MPI.d/MPI.conf
new file mode 120000
index 0000000..e3cfc7a
--- /dev/null
+++ b/config/MPI.d/MPI.conf
@@ -0,0 +1 @@
+../MPI.conf
\ No newline at end of file
diff --git a/config/hdf5.d/compiler.conf b/config/Programming.d/Compiler.conf
similarity index 100%
rename from config/hdf5.d/compiler.conf
rename to config/Programming.d/Compiler.conf
diff --git a/config/Tools.d/Compiler.conf b/config/Tools.d/Compiler.conf
new file mode 120000
index 0000000..78de1d9
--- /dev/null
+++ b/config/Tools.d/Compiler.conf
@@ -0,0 +1 @@
+../Compiler.conf
\ No newline at end of file
diff --git a/config/hdf5.d/hdf5.conf b/config/hdf5.d/hdf5.conf
deleted file mode 120000
index 4cc65f5..0000000
--- a/config/hdf5.d/hdf5.conf
+++ /dev/null
@@ -1 +0,0 @@
-../hdf5-1.8.12
\ No newline at end of file
diff --git a/config/hdf5.d/mpi.conf b/config/hdf5.d/mpi.conf
deleted file mode 120000
index 4cb2200..0000000
--- a/config/hdf5.d/mpi.conf
+++ /dev/null
@@ -1 +0,0 @@
-../openmpi-1.6.5
\ No newline at end of file
diff --git a/config/hdf5_serial.d/compiler.conf b/config/hdf5_serial.d/compiler.conf
deleted file mode 120000
index 1262fcf..0000000
--- a/config/hdf5_serial.d/compiler.conf
+++ /dev/null
@@ -1 +0,0 @@
-../gcc-4.7.3
\ No newline at end of file
diff --git a/config/modules b/config/modules
deleted file mode 100644
index 147a35b..0000000
--- a/config/modules
+++ /dev/null
@@ -1,17 +0,0 @@
-if [[ -z $EM_PREFIX ]]; then
-	EM_PREFIX_AFS='/afs/psi.ch/sys/@sys'
-	EM_PREFIX_LOCAL='/opt/em'
-
-	if [[ -d ${EM_PREFIX_LOCAL} ]]; then
-	        declare -x EM_PREFIX=${EM_PREFIX_LOCAL}
-	elif [[ -d ${EM_PREFIX_AFS} ]]; then
-        	declare -x EM_PREFIX=${EM_PREFIX_AFS}
-	else
-        	echo "Oops: cannot initialize Modules!"
-        	return 1
-	fi
-fi
-
-declare	-x	MODULES_VERSION='3.2.10'
-
-
diff --git a/config/mpi.d/compiler.conf b/config/mpi.d/compiler.conf
deleted file mode 120000
index 1262fcf..0000000
--- a/config/mpi.d/compiler.conf
+++ /dev/null
@@ -1 +0,0 @@
-../gcc-4.7.3
\ No newline at end of file
diff --git a/config/mpi.d/hdf5.conf b/config/mpi.d/hdf5.conf
deleted file mode 120000
index 4cc65f5..0000000
--- a/config/mpi.d/hdf5.conf
+++ /dev/null
@@ -1 +0,0 @@
-../hdf5-1.8.12
\ No newline at end of file
diff --git a/config/mpi.d/mpi.conf b/config/mpi.d/mpi.conf
deleted file mode 120000
index 4cb2200..0000000
--- a/config/mpi.d/mpi.conf
+++ /dev/null
@@ -1 +0,0 @@
-../openmpi-1.6.5
\ No newline at end of file
diff --git a/lib/libem.bash b/lib/libem.bash
index 4c54c1f..74a3915 100644
--- a/lib/libem.bash
+++ b/lib/libem.bash
@@ -59,8 +59,6 @@ _P=$(echo $P | tr [:lower:] [:upper:])
 _V=${_P}_VERSION
 unset ${_V}
 
-declare -rx CORE_VERSIONS_DIR="${SHLIBDIR}/../config/core.d"
-
 declare -i  JOBS=3
 
 #while read _name _version; do
@@ -282,22 +280,24 @@ function _set_env() {
 
 	# build module name
 	case ${EM_FAMILY} in
-	    core )
+	    Tools )
 		EM_MODULENAME="${P}/${V}"
 		;;
-	    compiler )
+	    Programming )
+		EM_MODULENAME="${P}/${V}"
+		;;
+	    Compiler )
 		EM_MODULENAME="${COMPILER}/${COMPILER_VERSION}/${P}/${V}"
 		;;
-	    mpi )
+	    MPI )
 		EM_MODULENAME="${COMPILER}/${COMPILER_VERSION}/${MPI}/${MPI_VERSION}/${P}/${V}"
 		;;
-	    hdf5 )
+	    HDF5 )
 		EM_MODULENAME="${COMPILER}/${COMPILER_VERSION}/${MPI}/${MPI_VERSION}/${HDF5}/${HDF5_VERSION}/${P}/${V}"
 		;;
-	    hdf5_serial )
+	    HDF5_serial )
 		EM_MODULENAME="${COMPILER}/${COMPILER_VERSION}/hdf5/${HDF5_SERIAL_VERSION}/${P}/${V}"
 		;;
-
 	esac
 
 	# set PREFIX of module
diff --git a/scripts/H5hut.build b/scripts/H5hut.build
index 4b446a4..00f3590 100755
--- a/scripts/H5hut.build
+++ b/scripts/H5hut.build
@@ -31,7 +31,7 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family 'hdf5'
+em.add_to_family 'HDF5'
 em.set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5'
 em.set_build_dependencies   "autoconf" "automake" "libtool" "${COMPILER}" "${MPI}" "vtk" "hdf5"
 em.make_all
diff --git a/scripts/H5hut_serial.build b/scripts/H5hut_serial.build
index fb449a4..44ae8e2 100755
--- a/scripts/H5hut_serial.build
+++ b/scripts/H5hut_serial.build
@@ -23,7 +23,7 @@ function em.install() {
 	make -C tools install
 }
 
-em.add_to_family 'hdf5_serial'
+em.add_to_family 'HDF5_serial'
 em.set_runtime_dependencies "${COMPILER}" 'hdf5_serial'
 em.set_build_dependencies   "autoconf" "automake" "libtool" "${COMPILER}" "vtk" "hdf5_serial"
 em.make_all
diff --git a/scripts/Lmod.build b/scripts/Lmod.build
index 8960394..bbf3f0f 100755
--- a/scripts/Lmod.build
+++ b/scripts/Lmod.build
@@ -19,7 +19,7 @@ function em.build() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
+em.add_to_family 'Tools'
 em.set_build_dependencies "lua"
 em.make_all
 em.cleanup_src
diff --git a/scripts/Modules.build b/scripts/Modules.build
index 3b48b53..ab0605b 100755
--- a/scripts/Modules.build
+++ b/scripts/Modules.build
@@ -3,9 +3,10 @@
 source "$(dirname $0)/../config/environment.bash"
 source "$(dirname $0)/../lib/libem.bash"
 
+
 function em.configure() {
 	"${EM_SRCDIR}"/configure \
-		--prefix="${EM_BINDIR}/core" \
+		--prefix="${EM_BINDIR}/${EM_FAMILY}" \
 		--with-module-path="${MODULEPATH_ROOT}" \
 		|| exit 1
 }
@@ -17,5 +18,5 @@ module() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
+em.add_to_family 'Tools'
 em.make_all
diff --git a/scripts/OPAL.build b/scripts/OPAL.build
index ca75376..327a801 100755
--- a/scripts/OPAL.build
+++ b/scripts/OPAL.build
@@ -10,8 +10,8 @@ function em.configure() {
 		"${EM_SRCDIR}"
 }
 
-em.add_to_family 'core'
-em.load_family 'hdf5'
+em.add_to_family 'Tools'
+em.load_family 'HDF5'
 em.set_runtime_dependencies "${COMPILER}" "${MPI}"
 em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'hdf5' 'H5hut' 'trilinos' 'ippl' 'gsl'
 em.make_all
diff --git a/scripts/autoconf.build b/scripts/autoconf.build
index 2f85a5f..e50628c 100755
--- a/scripts/autoconf.build
+++ b/scripts/autoconf.build
@@ -23,7 +23,7 @@ function em.install_doc() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
+em.add_to_family 'Programming'
 em.set_build_dependencies "m4"
 em.make_all
 
diff --git a/scripts/automake.build b/scripts/automake.build
index 59a299d..e10c0df 100755
--- a/scripts/automake.build
+++ b/scripts/automake.build
@@ -23,7 +23,7 @@ function em.install_doc() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
-em.set_build_dependencies "m4" "autoconf"
+em.add_to_family 'Programming'
+em.set_build_dependencies 'm4' 'autoconf'
 em.make_all
 
diff --git a/scripts/cmake.build b/scripts/cmake.build
index b96bb01..10cbdef 100755
--- a/scripts/cmake.build
+++ b/scripts/cmake.build
@@ -6,7 +6,7 @@ function em.configure() {
 	"${EM_SRCDIR}/bootstrap" --prefix="${PREFIX}"
 }
 
-em.add_to_family 'core'
+em.add_to_family 'Programming'
 em.set_build_dependencies "${COMPILER}"
 em.make_all
 
diff --git a/scripts/emacs.build b/scripts/emacs.build
index 787d166..d30d29e 100755
--- a/scripts/emacs.build
+++ b/scripts/emacs.build
@@ -28,7 +28,7 @@ function em.configure() {
 		|| exit 1
 }
 
-em.add_to_family "core"
+em.add_to_family 'Tools'
 em.set_build_dependencies ${build_dependencies}
 em.make_all
 
diff --git a/scripts/gcc.build b/scripts/gcc.build
index da78f47..dfea558 100755
--- a/scripts/gcc.build
+++ b/scripts/gcc.build
@@ -26,7 +26,7 @@ function em.install_doc() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
+em.add_to_family 'Programming'
 em.set_build_dependencies "gmp" "mpfr" "mpc"
 em.make_all
 
diff --git a/scripts/gmp.build b/scripts/gmp.build
index df3f03f..92554b6 100755
--- a/scripts/gmp.build
+++ b/scripts/gmp.build
@@ -13,6 +13,6 @@ function em.configure() {
 declare -rx CC=gcc
 declare -rx CPP=/usr/bin/cpp
 
-em.add_to_family "core"
+em.add_to_family 'Programming'
 em.make_all
 
diff --git a/scripts/gnuplot.build b/scripts/gnuplot.build
index 46805ab..9aa12a8 100755
--- a/scripts/gnuplot.build
+++ b/scripts/gnuplot.build
@@ -20,6 +20,6 @@ function em.install_doc() {
  		"${DOCDIR}"
 }
 
-em.add_to_family "core"
+em.add_to_family 'Tools'
 em.set_build_dependencies "${COMPILER}"
 em.make_all
diff --git a/scripts/gsl.build b/scripts/gsl.build
index dbf84b4..0183b1a 100755
--- a/scripts/gsl.build
+++ b/scripts/gsl.build
@@ -22,6 +22,6 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family "compiler"
+em.add_to_family 'Compiler'
 em.set_build_dependencies "${COMPILER}"
 em.make_all
diff --git a/scripts/hdf5.build b/scripts/hdf5.build
index a15cab3..db0f8eb 100755
--- a/scripts/hdf5.build
+++ b/scripts/hdf5.build
@@ -22,7 +22,7 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family "mpi"
+em.add_to_family 'MPI'
 em.set_runtime_dependencies "${COMPILER}" "${MPI}"
 em.set_build_dependencies "${COMPILER}" "${MPI}"
 em.make_all
diff --git a/scripts/hdf5_serial.build b/scripts/hdf5_serial.build
index 7523afa..a5c9770 100755
--- a/scripts/hdf5_serial.build
+++ b/scripts/hdf5_serial.build
@@ -12,7 +12,7 @@ function em.configure() {
 		|| exit 1
 }
 
-em.add_to_family "compiler"
+em.add_to_family 'Compiler'
 em.set_build_dependencies "${COMPILER}"
 em.make_all
 
diff --git a/scripts/ippl.build b/scripts/ippl.build
index df9d977..fa11106 100755
--- a/scripts/ippl.build
+++ b/scripts/ippl.build
@@ -18,9 +18,9 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family "mpi"
+em.add_to_family 'MPI'
 em.set_runtime_dependencies "${COMPILER}" "${MPI}"
-em.set_build_dependencies "cmake" "${COMPILER}" "${MPI}"
+em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}"
 em.make_all
 
 
diff --git a/scripts/libtool.build b/scripts/libtool.build
index 2bc3abc..8d05565 100755
--- a/scripts/libtool.build
+++ b/scripts/libtool.build
@@ -21,7 +21,7 @@ function em.install_doc() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
+em.add_to_family 'Programming'
 em.set_build_dependencies "autoconf" "automake"
 em.make_all
 
diff --git a/scripts/lua.build b/scripts/lua.build
index 00dcea8..6ada17c 100755
--- a/scripts/lua.build
+++ b/scripts/lua.build
@@ -18,7 +18,7 @@ function em.build() {
 	make -j ${JOBS}
 }
 
-em.add_to_family "core"
+em.add_to_family 'Programming'
 em.set_build_dependencies "${COMPILER}"
 em.make_all
 em.cleanup_src
diff --git a/scripts/m4.build b/scripts/m4.build
index 9a07187..506c4a9 100755
--- a/scripts/m4.build
+++ b/scripts/m4.build
@@ -11,5 +11,5 @@ function em.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
+em.add_to_family 'Programming'
 em.make_all
diff --git a/scripts/mathlib.build b/scripts/mathlib.build
index c1e7403..0cd7ed1 100755
--- a/scripts/mathlib.build
+++ b/scripts/mathlib.build
@@ -47,7 +47,7 @@ function em.install_doc() {
 	:
 }
 
-em.add_to_family "compiler"
+em.add_to_family 'Compiler'
 em.set_runtime_dependencies "${COMPILER}"
 em.set_build_dependencies "${COMPILER}"
 em.make_all
diff --git a/scripts/mpc.build b/scripts/mpc.build
index 73cc892..ae44d42 100755
--- a/scripts/mpc.build
+++ b/scripts/mpc.build
@@ -14,7 +14,7 @@ function em.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
-em.set_build_dependencies "gmp" "mpfr"
+em.add_to_family 'Programming'
+em.set_build_dependencies 'gmp' 'mpfr'
 em.make_all
 
diff --git a/scripts/mpfr.build b/scripts/mpfr.build
index ba7cf06..60cec9e 100755
--- a/scripts/mpfr.build
+++ b/scripts/mpfr.build
@@ -13,6 +13,6 @@ function em.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
-em.set_build_dependencies "gmp"
+em.add_to_family 'Programming'
+em.set_build_dependencies 'gmp'
 em.make_all
diff --git a/scripts/openmpi.build b/scripts/openmpi.build
index 43729d0..d9df96e 100755
--- a/scripts/openmpi.build
+++ b/scripts/openmpi.build
@@ -23,7 +23,7 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family "compiler"
+em.add_to_family 'Compiler'
 em.set_runtime_dependencies "${COMPILER}"
 em.set_build_dependencies "${COMPILER}"
 em.make_all
diff --git a/scripts/parmetis.build b/scripts/parmetis.build
index 22c4cee..8af9dc8 100755
--- a/scripts/parmetis.build
+++ b/scripts/parmetis.build
@@ -48,7 +48,7 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family "mpi"
+em.add_to_family 'MPI'
 em.set_runtime_dependencies "${COMPILER}" "${MPI}"
 em.set_build_dependencies "${COMPILER}" "${MPI}"
 em.make_all
diff --git a/scripts/root.build b/scripts/root.build
index e75086e..ee52096 100755
--- a/scripts/root.build
+++ b/scripts/root.build
@@ -61,7 +61,7 @@ function em.install() {
 	mv "${PREFIX}/README"  "${DOCDIR}"
 }
 
-em.add_to_family "compiler"
+em.add_to_family 'Compiler'
 em.set_runtime_dependencies "${COMPILER}"
 em.set_build_dependencies "${COMPILER}"
 em.make_all
diff --git a/scripts/toolchain.build b/scripts/toolchain.build
deleted file mode 100755
index 79d1c10..0000000
--- a/scripts/toolchain.build
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-declare -r SCRIPTS_DIR=$(dirname $0)
-
-bash "${SCRIPTS_DIR}/m4.build" "$@"		|| exit 1
-bash "${SCRIPTS_DIR}/autoconf.build" "$@"	|| exit 1
-bash "${SCRIPTS_DIR}/automake.build" "$@"	|| exit 2
-bash "${SCRIPTS_DIR}/libtool.build" "$@"	|| exit 3
-bash "${SCRIPTS_DIR}/gmp.build" "$@"		|| exit 4
-bash "${SCRIPTS_DIR}/mpfr.build" "$@"		|| exit 5
-bash "${SCRIPTS_DIR}/mpc.build" "$@"		|| exit 6
-bash "${SCRIPTS_DIR}/gcc.build" "$@"		|| exit 7
-
diff --git a/scripts/trilinos.build b/scripts/trilinos.build
index 0e16ffb..99fbc0a 100755
--- a/scripts/trilinos.build
+++ b/scripts/trilinos.build
@@ -71,8 +71,8 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family "mpi"
+em.add_to_family 'MPI'
 em.set_runtime_dependencies "${COMPILER}" "${MPI}"
-em.set_build_dependencies "cmake" "${COMPILER}" "${MPI}" "mathlib" "parmetis"
+em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'mathlib' 'parmetis'
 em.make_all
 
diff --git a/scripts/vtk.build b/scripts/vtk.build
index 88f3fca..bba2174 100755
--- a/scripts/vtk.build
+++ b/scripts/vtk.build
@@ -26,8 +26,8 @@ function em.configure() {
 		"${EM_SRCDIR}"
 }
 
-em.add_to_family "compiler"
+em.add_to_family 'Compiler'
 em.set_runtime_dependencies "${COMPILER}"
-em.set_build_dependencies "cmake" "${COMPILER}"
+em.set_build_dependencies 'cmake' "${COMPILER}"
 em.make_all