diff --git a/MPI/hdf5/1.10/variants.Darwin b/MPI/hdf5/1.10/variants.Darwin
deleted file mode 100644
index b970ce0..0000000
--- a/MPI/hdf5/1.10/variants.Darwin
+++ /dev/null
@@ -1,14 +0,0 @@
-hdf5/1.10.0	stable		gcc/4.8.5 openmpi/1.10.2
-hdf5/1.10.0	stable		gcc/4.9.3 openmpi/1.10.2
-hdf5/1.10.0	stable		gcc/5.3.0 openmpi/1.10.2
-hdf5/1.10.0	stable		gcc/6.1.0 openmpi/1.10.2
-
-hdf5/1.10.1	stable		clang-macos/9.0.0 openmpi/1.10.7
-hdf5/1.10.1	stable		clang-macos/9.0.0 openmpi/2.1.2
-hdf5/1.10.1	stable		clang-macos/9.0.0 openmpi/3.0.0
-hdf5/1.10.1	stable		gcc/7.3.0 openmpi/1.10.7
-hdf5/1.10.1	stable		gcc/7.3.0 openmpi/2.1.2
-hdf5/1.10.1	stable		gcc/7.3.0 openmpi/3.0.0
-hdf5/1.10.3	stable		gcc/7.3.0 openmpi/3.1.2
-hdf5/1.10.4	stable		gcc/7.3.0 openmpi/3.1.3
-
diff --git a/MPI/hdf5/1.10/variants.Linux b/MPI/hdf5/1.10/variants.Linux
deleted file mode 100644
index d38bc8c..0000000
--- a/MPI/hdf5/1.10/variants.Linux
+++ /dev/null
@@ -1,30 +0,0 @@
-hdf5/1.10.0	stable		gcc/4.8.5 openmpi/1.10.2
-hdf5/1.10.0	stable		gcc/5.3.0 openmpi/1.10.2
-hdf5/1.10.0	stable		gcc/6.1.0 openmpi/1.10.2
-
-hdf5/1.10.1	stable		gcc/7.3.0 openmpi/1.10.7
-hdf5/1.10.1	stable		gcc/7.3.0 openmpi/2.1.2
-hdf5/1.10.1	stable		gcc/7.3.0 openmpi/3.0.0
-hdf5/1.10.1	stable		gcc/7.3.0 openmpi/3.0.1
-
-hdf5/1.10.1	stable		intel/17.4 openmpi/1.10.7
-hdf5/1.10.1	stable		intel/17.4 openmpi/2.1.2
-hdf5/1.10.1	stable		intel/17.4 openmpi/3.0.0
-
-hdf5/1.10.1	stable		pgi/18.5 pgi-mpi/18.5
-
-hdf5/1.10.2 	stable    	gcc/7.3.0 openmpi/3.0.1
-hdf5/1.10.3 	stable    	gcc/7.3.0 openmpi/3.1.2
-hdf5/1.10.3	stable		intel/17.4 intel-mpi/17.4
-
-hdf5/1.10.4 	stable    	gcc/5.5.0 openmpi/3.1.3
-hdf5/1.10.4 	stable    	gcc/6.4.0 openmpi/3.1.3
-hdf5/1.10.4 	stable    	gcc/6.5.0 openmpi/3.1.3
-hdf5/1.10.4 	stable    	gcc/7.3.0 openmpi/3.1.3
-hdf5/1.10.4 	stable    	gcc/7.4.0 openmpi/3.1.3
-hdf5/1.10.4 	stable    	gcc/8.2.0 openmpi/3.1.3
-hdf5/1.10.4 	stable    	gcc/8.3.0 openmpi/3.1.3
-
-hdf5/1.10.4	stable		pgi/18.5 pgi-mpi/18.5
-
-hdf5/1.10.4 	stable    	gcc/7.3.0 mpich/3.3
diff --git a/MPI/hdf5/1.8/variants b/MPI/hdf5/1.8/variants
deleted file mode 100644
index 55ea25c..0000000
--- a/MPI/hdf5/1.8/variants
+++ /dev/null
@@ -1,91 +0,0 @@
-hdf5/1.8.12	stable		gcc/4.7.4 openmpi/1.6.5
-hdf5/1.8.12	stable		gcc/4.7.4 openmpi/1.8.2
-hdf5/1.8.12	stable		gcc/4.7.4 openmpi/1.8.4
-hdf5/1.8.12	stable		gcc/4.8.3 openmpi/1.6.5
-hdf5/1.8.12	stable		gcc/4.8.3 openmpi/1.8.2
-hdf5/1.8.12	stable		gcc/4.8.3 openmpi/1.8.4
-hdf5/1.8.12	stable		gcc/4.8.4 openmpi/1.6.5
-hdf5/1.8.12	stable		gcc/4.8.4 openmpi/1.8.2
-hdf5/1.8.12	stable		gcc/4.8.4 openmpi/1.8.4
-hdf5/1.8.12	stable		gcc/4.8.5 openmpi/1.8.8
-hdf5/1.8.12	deprecated	gcc/4.9.2 openmpi/1.6.5
-hdf5/1.8.12	deprecated	gcc/4.9.2 openmpi/1.8.2
-hdf5/1.8.12	deprecated	gcc/4.9.2 openmpi/1.8.4
-
-hdf5/1.8.14	stable		gcc/4.7.4 openmpi/1.6.5
-hdf5/1.8.14	stable		gcc/4.7.4 openmpi/1.8.2
-hdf5/1.8.14	stable		gcc/4.7.4 openmpi/1.8.4
-hdf5/1.8.14	stable		gcc/4.8.3 openmpi/1.6.5
-hdf5/1.8.14	stable		gcc/4.8.3 openmpi/1.8.2
-hdf5/1.8.14	stable		gcc/4.8.3 openmpi/1.8.4
-hdf5/1.8.14	stable		gcc/4.8.4 openmpi/1.6.5
-hdf5/1.8.14	stable		gcc/4.8.4 openmpi/1.8.2
-hdf5/1.8.14	stable		gcc/4.8.4 openmpi/1.8.4
-hdf5/1.8.14	stable		gcc/4.8.4 openmpi/1.8.8
-hdf5/1.8.14	deprecated	gcc/4.9.2 openmpi/1.6.5
-hdf5/1.8.14	deprecated	gcc/4.9.2 openmpi/1.8.2
-hdf5/1.8.14	deprecated	gcc/4.9.2 openmpi/1.8.4
-
-hdf5/1.8.15.1	deprecated	gcc/5.2.0 openmpi/1.8.8
-
-hdf5/1.8.16	stable		gcc/4.8.5 openmpi/1.8.8
-hdf5/1.8.16	stable		gcc/4.8.5 openmpi/1.10.2
-hdf5/1.8.16	stable		gcc/4.9.3 openmpi/1.8.8
-hdf5/1.8.16	stable		gcc/4.9.3 openmpi/1.10.2
-hdf5/1.8.16	stable		gcc/5.3.0 openmpi/1.8.8
-hdf5/1.8.16	stable		gcc/5.3.0 openmpi/1.10.2
-hdf5/1.8.16	stable		gcc/6.1.0 openmpi/1.8.8
-hdf5/1.8.16	stable		gcc/6.1.0 openmpi/1.10.2
-
-hdf5/1.8.17	stable		gcc/4.8.5 openmpi/1.8.8
-hdf5/1.8.17	stable		gcc/4.9.3 openmpi/1.8.8
-hdf5/1.8.17	stable		gcc/5.3.0 openmpi/1.8.8
-hdf5/1.8.17	stable		gcc/6.1.0 openmpi/1.8.8
-
-hdf5/1.8.17	stable		gcc/4.8.5 openmpi/1.10.2
-hdf5/1.8.17	stable		gcc/4.9.3 openmpi/1.10.2
-hdf5/1.8.17	stable		gcc/5.3.0 openmpi/1.10.2
-hdf5/1.8.17	stable		gcc/6.1.0 openmpi/1.10.2
-hdf5/1.8.17	stable		gcc/6.2.0 openmpi/1.10.2
-
-hdf5/1.8.17	stable		gcc/4.8.5 openmpi/1.10.4
-hdf5/1.8.17	stable		gcc/4.9.4 openmpi/1.10.4
-hdf5/1.8.17	stable		gcc/5.4.0 openmpi/1.10.4
-hdf5/1.8.17	stable		gcc/6.2.0 openmpi/1.10.4
-
-hdf5/1.8.18	stable		gcc/4.8.5 openmpi/1.10.4
-hdf5/1.8.18	stable		gcc/4.9.4 openmpi/1.10.4
-hdf5/1.8.18	stable		gcc/5.4.0 openmpi/1.10.4
-hdf5/1.8.18	stable		gcc/6.2.0 openmpi/1.10.4
-
-hdf5/1.8.20	stable		gcc/4.8.5 openmpi/1.10.4
-hdf5/1.8.20	stable		gcc/5.5.0 openmpi/1.10.4
-hdf5/1.8.20	stable		gcc/6.4.0 openmpi/1.10.4
-hdf5/1.8.20	stable		gcc/7.3.0 openmpi/1.10.4
-hdf5/1.8.20	stable		gcc/8.2.0 openmpi/1.10.4
-
-hdf5/1.8.20	stable		gcc/4.8.5 openmpi/1.10.7
-hdf5/1.8.20	stable		gcc/5.5.0 openmpi/1.10.7
-hdf5/1.8.20	stable		gcc/6.4.0 openmpi/1.10.7
-hdf5/1.8.20	stable		gcc/7.3.0 openmpi/1.10.7
-hdf5/1.8.20	stable		gcc/8.2.0 openmpi/1.10.7
-
-hdf5/1.8.20	stable		gcc/4.8.5 openmpi/2.1.5
-hdf5/1.8.20	stable		gcc/5.5.0 openmpi/2.1.5
-hdf5/1.8.20	stable		gcc/6.4.0 openmpi/2.1.5
-hdf5/1.8.20	stable		gcc/7.3.0 openmpi/2.1.5
-hdf5/1.8.20	stable		gcc/8.2.0 openmpi/2.1.5
-
-hdf5/1.8.20	stable		gcc/4.8.5 openmpi/3.1.3
-hdf5/1.8.20	stable		gcc/5.5.0 openmpi/3.1.3
-hdf5/1.8.20	stable		gcc/6.4.0 openmpi/3.1.3
-hdf5/1.8.20	stable		gcc/7.3.0 openmpi/3.1.3
-hdf5/1.8.20	stable		gcc/8.2.0 openmpi/2.1.5
-
-hdf5/1.8.20	stable		gcc/4.8.5 mpich/3.2.1
-hdf5/1.8.20	stable		gcc/5.5.0 mpich/3.2.1
-hdf5/1.8.20	stable		gcc/6.4.0 mpich/3.2.1
-hdf5/1.8.20	stable		gcc/7.3.0 mpich/3.2.1
-hdf5/1.8.20	stable		gcc/8.2.0 mpich/3.2.1
-
-hdf5/1.8.20	unstable	intel/18.4 impi/18.4
diff --git a/MPI/hdf5/1.8/variants.Edison b/MPI/hdf5/files/variants.Edison
similarity index 100%
rename from MPI/hdf5/1.8/variants.Edison
rename to MPI/hdf5/files/variants.Edison
diff --git a/MPI/hdf5/files/variants.macos10.14 b/MPI/hdf5/files/variants.macos10.14
new file mode 100644
index 0000000..d97d128
--- /dev/null
+++ b/MPI/hdf5/files/variants.macos10.14
@@ -0,0 +1,27 @@
+hdf5/1.8.12          deprecated gcc/{4.7.4,4.8.3,4.8.3,4.9.2} openmpi/{1.6.5,1.8.2,1.8.4}
+hdf5/1.8.12          deprecated gcc/4.8.5 openmpi/1.8.8
+hdf5/1.8.12          deprecated gcc/5.3.0 openmpi/1.10.2
+
+hdf5/1.8.14          deprecated gcc/{4.7.4,4.8.3,4.8.4,4.9.2} openmpi/{1.6.5,1.8.2,1.8.4}
+hdf5/1.8.14          deprecated gcc/4.8.4 openmpi/1.8.8
+
+hdf5/1.8.15.1        deprecated gcc/{4.8.4,4.9.2} openmpi/1.10.0
+hdf5/1.8.15.1        deprecated gcc/5.2.0 openmpi/1.8.8
+
+hdf5/1.8.16          stable     gcc/{4.8.5,4.9.3,5.3.0,6.1.0} openmpi/{1.8.8,1.10.2}
+
+hdf5/1.8.17          stable     gcc/4.8.5 openmpi/{1.8.8,1.10.2,1.10.4}
+hdf5/1.8.17          stable     gcc/{4.9.3,5.3.0,6.1.0} openmpi/{1.8.8,1.10.2}
+hdf5/1.8.17          stable     gcc/{4.9.4,5.4.0} openmpi/1.10.4
+hdf5/1.8.17          stable     gcc/6.2.0 openmpi/{1.10.2,1.10.4,2.0.1}
+
+hdf5/1.8.18          stable     gcc/{4.8.5,4.9.4,5.4.0,6.2.0} openmpi/1.10.4
+
+hdf5/1.10.0          stable     gcc/{5.3.0,6.1.0} openmpi/1.10.2
+
+hdf5/1.10.1          stable     clang-macos/9.0.0 openmpi/{1.10.7,2.1.2,3.0.0}
+hdf5/1.10.1          stable     gcc/7.3.0 openmpi/{1.10.7,2.1.2,3.0.0,3.0.1}
+
+hdf5/1.10.3          stable     gcc/7.3.0 openmpi/3.1.2
+
+hdf5/1.10.4          stable     gcc/7.3.0 openmpi/3.1.3
diff --git a/MPI/hdf5/files/variants.rhel6 b/MPI/hdf5/files/variants.rhel6
new file mode 100644
index 0000000..383bf74
--- /dev/null
+++ b/MPI/hdf5/files/variants.rhel6
@@ -0,0 +1,39 @@
+hdf5/1.8.12	stable		gcc/{4.7.4,4.8.3,4.8.4} openmpi/{1.6.5,1.8.2,1.8.4}
+
+hdf5/1.8.12	stable		gcc/4.8.5 openmpi/1.8.8
+hdf5/1.8.12	deprecated	gcc/4.9.2 openmpi/{1.6.5,1.8.2,1.8.4}
+
+hdf5/1.8.14	stable		gcc/{4.7.4,4.8.3,4.8.4} openmpi/{1.6.5,1.8.2,1.8.4}
+hdf5/1.8.14	stable		gcc/4.8.4 openmpi/1.8.8
+
+hdf5/1.8.14	deprecated	gcc/4.9.2 openmpi/{1.6.5,1.8.2,1.8.4}
+
+hdf5/1.8.15.1	deprecated	gcc/5.2.0 openmpi/1.8.8
+
+hdf5/1.8.16	stable		gcc/{4.8.5,4.9.3,5.3.0,6.1.0} openmpi/{1.8.8,1.10.2}
+
+hdf5/1.8.17	stable		gcc/{4.8.5,4.9.3,5.3.0,6.1.0} openmpi/{1.8.8,1.10.2}
+hdf5/1.8.17	stable		gcc/6.2.0 openmpi/1.10.2
+hdf5/1.8.17	stable		gcc/{4.8.5,4.9.4,5.4.0,6.2.0} openmpi/1.10.4
+
+hdf5/1.8.18	stable		gcc/{4.8.5,4.9.4,5.4.0,6.2.0} openmpi/1.10.4
+hdf5/1.8.20	stable		gcc/{4.8.5,5.5.0,6.4.0,7.3.0,8.2.0} openmpi/{1.10.4,1.10.7,2.1.5,3.1.3,3.2.1}
+hdf5/1.8.20	unstable	intel/18.4 impi/18.4
+
+hdf5/1.10.0	stable		gcc/{4.8.5,5.3.0,6.1.0} openmpi/1.10.2
+hdf5/1.10.0	stable		gcc/5.3.0 openmpi/1.10.2
+hdf5/1.10.0	stable		gcc/6.1.0 openmpi/1.10.2
+
+hdf5/1.10.1	stable		gcc/7.3.0 openmpi/{1.10.7,2.1.2,3.0.0,3.0.1}
+hdf5/1.10.1	stable		intel/17.4 openmpi/{1.10.7,2.1.2,3.0.0}
+hdf5/1.10.1	stable		pgi/18.5 pgi-mpi/18.5
+
+hdf5/1.10.2 	stable    	gcc/7.3.0 openmpi/3.0.1
+
+hdf5/1.10.3 	stable    	gcc/7.3.0 openmpi/3.1.2
+hdf5/1.10.3	stable		intel/17.4 intel-mpi/17.4
+
+hdf5/1.10.4 	stable    	gcc/{5.5.0,6.4.0,7.3.0,8.2.0} openmpi/3.1.3
+hdf5/1.10.4 	stable    	gcc/7.3.0 mpich/3.3
+
+hdf5/1.10.5	unstable	gcc/{7.4.0,8.3.0,9.2.0} openmpi/3.1.4