diff --git a/Compiler/build_all_variants b/Compiler/build_all_variants
deleted file mode 100755
index bd2e5b5..0000000
--- a/Compiler/build_all_variants
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-declare -r basedir=$(dirname $0)
-source '../../config/Pmodules.conf'
-
-declare -r recipe="${basedir}/$1/build"
-shift
-
-if [[ ! -x "${recipe}" ]]; then
-	echo "Error: no recipe to build '$1'!"
-	exit 1
-fi
-
-for cc in "${COMPILER_VERSIONS[@]}"; do
-	"${recipe}" "$@" --with=$cc || {
-		echo "Oops: build failed for:"
-		echo "        compile: $cc"
-	}
-done
diff --git a/Compiler/pgi-mpi/Readme.md b/Compiler/pgi-mpi/Readme.md
new file mode 100644
index 0000000..5c1be1d
--- /dev/null
+++ b/Compiler/pgi-mpi/Readme.md
@@ -0,0 +1,5 @@
+After installing PGI, the localrc file of the pgi installation needs to be modified by issuing the following commands in the directory where the localrc file is located:
+
+    module add gcc/<appropriate version>  # currently 7.3.0
+    ./makelocalrc -x -gcc $(which gcc) -gpp $(which g++) -g77 $(which gfortran)
+
diff --git a/Compiler/pgi-mpi/build b/Compiler/pgi-mpi/build
new file mode 100755
index 0000000..583a6e6
--- /dev/null
+++ b/Compiler/pgi-mpi/build
@@ -0,0 +1,19 @@
+#!/usr/bin/env modbuild
+
+pbuild::add_to_group 'Compiler'
+pbuild::prep() {
+	:
+}
+
+pbuild::configure() {
+	:
+}
+
+pbuild::compile() {
+	:
+}
+
+pbuild::install() {
+	:
+}
+
diff --git a/Compiler/pgi-mpi/files/variants b/Compiler/pgi-mpi/files/variants
new file mode 100644
index 0000000..2f63ea2
--- /dev/null
+++ b/Compiler/pgi-mpi/files/variants
@@ -0,0 +1 @@
+pgi-mpi/18.5	stable	pgi/18.5
diff --git a/Compiler/pgi-mpi/modulefile b/Compiler/pgi-mpi/modulefile
new file mode 100644
index 0000000..ca7d93f
--- /dev/null
+++ b/Compiler/pgi-mpi/modulefile
@@ -0,0 +1,82 @@
+#%Module
+
+module-whatis		"open source MPI-2 implementation"
+module-url		"http://www.open-mpi.org/"
+module-license		"See https://www.open-mpi.org/community/license.php"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+module-addgroup		"MPI"
+module-help		"
+
+Purpose
+-------
+  This module file defines the system paths and environment variables
+  needed to use Open MPI version 2.1.2 with the PGI Compilers and Tools
+  version 2018.  The available compiler wrappers are mpicc, mpicxx,
+  mpic++, mpiCC, mpif77, and mpif90.
+
+
+Product Description
+-------------------
+  The Open MPI Project is an open source MPI-2 implementation that is
+  developed and maintained by a consortium of academic, research, and
+  industry partners. Open MPI is therefore able to combine the
+  expertise, technologies, and resources from all across the High
+  Performance Computing community in order to build the best MPI library
+  available. Open MPI offers advantages for system and software vendors,
+  application developers and computer science researchers.
+
+
+Product and OS Dependencies
+---------------------------
+  For more information about Open MPI, see the following URL:
+
+    http://www.open-mpi.org/
+
+
+Documentation
+-------------
+  No online documentation provided.
+            
+"
+
+conflict mpich
+conflict mvapich2
+
+set kern [ exec uname -s ]
+if { $kern == "Linux" } {
+	set bits [ exec uname -m ]
+	if { $bits == "x86_64" } {
+		if { [is-loaded pgi-llvm] } {
+			set target linux86-64-llvm
+		} else {
+			set target linux86-64
+		}
+	} elseif { $bits == "ppc64le" } {
+		set target linuxpower
+	} else {
+		puts stderr "This library is currently not supported on this platform."
+		exit 1
+	}
+} elseif { $kern == "Darwin" } {
+	set target osx86-64
+}
+
+set libdir "$::env(PGI_PREFIX)/${target}/2018/mpi/openmpi"
+
+prepend-path PATH $libdir/bin
+prepend-path LD_LIBRARY_PATH $libdir/lib
+prepend-path MANPATH $libdir/share/man
+
+setenv          MPICC                   $libdir/bin/mpicc
+setenv          MPICXX                  $libdir/bin/mpicxx
+setenv          MPIF77                  $libdir/bin/mpif77
+setenv          MPIF90                  $libdir/bin/mpif90
+setenv          MPIFC                   $libdir/bin/mpif90
+setenv          MPIFORTRAN              $libdir/bin/mpif90
+setenv          MPIEXEC                 $libdir/bin/mpiexec
+setenv          MPIRUN                  $libdir/bin/mpirun
+setenv		OPAL_PREFIX		$libdir
+setenv		PGI_MPI_INCLUDE_DIR	$libdir/include
+setenv		PGI_MPI_LIBRARY_DIR	$libdir/lib
+prepend-path	C_INCLUDE_PATH		$libdir/include
+prepend-path	LIBRARY_PATH		$libdir/lib
diff --git a/Programming/gcc/4/variants b/Programming/gcc/4/variants
deleted file mode 100644
index c5f6713..0000000
--- a/Programming/gcc/4/variants
+++ /dev/null
@@ -1,9 +0,0 @@
-gcc/4.7.4	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.2	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.3	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.4	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.5	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/4.9.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.9.2	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.9.3	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/4.9.4	stable		b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
diff --git a/Programming/gcc/5/variants b/Programming/gcc/5/variants
deleted file mode 100644
index 1cbbe74..0000000
--- a/Programming/gcc/5/variants
+++ /dev/null
@@ -1,6 +0,0 @@
-gcc/5.1.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/5.2.0	deprecated	b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/5.3.0	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/5.4.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
-gcc/5.5.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.1 b:mpc/1.1.0-1
-
diff --git a/Programming/gcc/6/variants b/Programming/gcc/6/variants
deleted file mode 100644
index 66a92ce..0000000
--- a/Programming/gcc/6/variants
+++ /dev/null
@@ -1,4 +0,0 @@
-gcc/6.1.0	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/6.2.0	stable		b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/6.3.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
-gcc/6.4.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3
diff --git a/Programming/gcc/7/variants b/Programming/gcc/7/variants
deleted file mode 100644
index 741e336..0000000
--- a/Programming/gcc/7/variants
+++ /dev/null
@@ -1,3 +0,0 @@
-gcc/7.1.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3
-gcc/7.2.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
-gcc/7.3.0	stable		b:gmp/6.1.2 b:mpfr/4.0.0 b:mpc/1.1.0
diff --git a/Programming/gcc/8/variants b/Programming/gcc/8/variants
deleted file mode 100644
index 6033e7a..0000000
--- a/Programming/gcc/8/variants
+++ /dev/null
@@ -1,2 +0,0 @@
-gcc/8.1.0	stable		b:gmp/6.1.2 b:mpfr/4.0.1 b:mpc/1.1.0
-gcc/8.2.0	stable		b:gmp/6.1.2 b:mpfr/4.0.1 b:mpc/1.1.0
diff --git a/System/pkg-config/build b/Tools/pkg-config/build
similarity index 100%
rename from System/pkg-config/build
rename to Tools/pkg-config/build
diff --git a/System/pkg-config/files/variants b/Tools/pkg-config/files/variants
similarity index 100%
rename from System/pkg-config/files/variants
rename to Tools/pkg-config/files/variants
diff --git a/System/pkg-config/modulefile b/Tools/pkg-config/modulefile
similarity index 100%
rename from System/pkg-config/modulefile
rename to Tools/pkg-config/modulefile
diff --git a/Tools/vim/8/variants b/Tools/vim/files/variants
similarity index 100%
rename from Tools/vim/8/variants
rename to Tools/vim/files/variants