diff --git a/scripts/H5root.build b/scripts/Compiler/H5root.build
similarity index 100%
rename from scripts/H5root.build
rename to scripts/Compiler/H5root.build
diff --git a/scripts/OpenBLAS.build b/scripts/Compiler/OpenBLAS.build
similarity index 100%
rename from scripts/OpenBLAS.build
rename to scripts/Compiler/OpenBLAS.build
diff --git a/scripts/OpenBLAS_OMP.build b/scripts/Compiler/OpenBLAS_OMP.build
similarity index 100%
rename from scripts/OpenBLAS_OMP.build
rename to scripts/Compiler/OpenBLAS_OMP.build
diff --git a/scripts/SuperLU.build b/scripts/Compiler/SuperLU.build
similarity index 100%
rename from scripts/SuperLU.build
rename to scripts/Compiler/SuperLU.build
diff --git a/scripts/UMFPACK.bash b/scripts/Compiler/UMFPACK.build
similarity index 100%
rename from scripts/UMFPACK.bash
rename to scripts/Compiler/UMFPACK.build
diff --git a/scripts/H5hut.build b/scripts/HDF5/H5hut.build
similarity index 100%
rename from scripts/H5hut.build
rename to scripts/HDF5/H5hut.build
diff --git a/scripts/netcdf.build b/scripts/HDF5/netcdf.build
similarity index 100%
rename from scripts/netcdf.build
rename to scripts/HDF5/netcdf.build
diff --git a/scripts/H5hut_serial.build b/scripts/HDF5_serial/H5hut_serial.build
similarity index 100%
rename from scripts/H5hut_serial.build
rename to scripts/HDF5_serial/H5hut_serial.build
diff --git a/scripts/BoxLib.build b/scripts/MPI/BoxLib.build
similarity index 100%
rename from scripts/BoxLib.build
rename to scripts/MPI/BoxLib.build
diff --git a/scripts/OPAL.build b/scripts/MPI/OPAL.build
similarity index 100%
rename from scripts/OPAL.build
rename to scripts/MPI/OPAL.build
diff --git a/scripts/SuperLU_DIST.build b/scripts/MPI/SuperLU_DIST.build
similarity index 100%
rename from scripts/SuperLU_DIST.build
rename to scripts/MPI/SuperLU_DIST.build
diff --git a/scripts/Python.build b/scripts/Programming/Python.build
similarity index 100%
rename from scripts/Python.build
rename to scripts/Programming/Python.build
diff --git a/scripts/Tcl.build b/scripts/Programming/Tcl.build
similarity index 100%
rename from scripts/Tcl.build
rename to scripts/Programming/Tcl.build
diff --git a/scripts/autoconf.build b/scripts/Programming/autoconf.build
similarity index 100%
rename from scripts/autoconf.build
rename to scripts/Programming/autoconf.build
diff --git a/scripts/automake.build b/scripts/Programming/automake.build
similarity index 100%
rename from scripts/automake.build
rename to scripts/Programming/automake.build
diff --git a/scripts/cmake.build b/scripts/Programming/cmake.build
similarity index 100%
rename from scripts/cmake.build
rename to scripts/Programming/cmake.build
diff --git a/scripts/gcc.build b/scripts/Programming/gcc.build
similarity index 100%
rename from scripts/gcc.build
rename to scripts/Programming/gcc.build
diff --git a/scripts/gtest.build b/scripts/Programming/gtest.build
similarity index 100%
rename from scripts/gtest.build
rename to scripts/Programming/gtest.build
diff --git a/scripts/libtool.build b/scripts/Programming/libtool.build
similarity index 100%
rename from scripts/libtool.build
rename to scripts/Programming/libtool.build
diff --git a/scripts/lua.build b/scripts/Programming/lua.build
similarity index 100%
rename from scripts/lua.build
rename to scripts/Programming/lua.build
diff --git a/scripts/m4.build b/scripts/Programming/m4.build
similarity index 100%
rename from scripts/m4.build
rename to scripts/Programming/m4.build
diff --git a/scripts/psi-python27.build b/scripts/Programming/psi-python27.build
similarity index 100%
rename from scripts/psi-python27.build
rename to scripts/Programming/psi-python27.build
diff --git a/scripts/bash.build b/scripts/System/bash.build
similarity index 100%
rename from scripts/bash.build
rename to scripts/System/bash.build
diff --git a/scripts/boost.build b/scripts/System/boost.build
similarity index 100%
rename from scripts/boost.build
rename to scripts/System/boost.build
diff --git a/scripts/filebench.build b/scripts/System/filebench.build
similarity index 100%
rename from scripts/filebench.build
rename to scripts/System/filebench.build
diff --git a/scripts/fsstress.build b/scripts/System/fsstress.build
similarity index 100%
rename from scripts/fsstress.build
rename to scripts/System/fsstress.build
diff --git a/scripts/giflib.build b/scripts/System/giflib.build
similarity index 100%
rename from scripts/giflib.build
rename to scripts/System/giflib.build
diff --git a/scripts/gmp.build b/scripts/System/gmp.build
similarity index 100%
rename from scripts/gmp.build
rename to scripts/System/gmp.build
diff --git a/scripts/gsl.build b/scripts/System/gsl.build
similarity index 100%
rename from scripts/gsl.build
rename to scripts/System/gsl.build
diff --git a/scripts/hdf5.build b/scripts/System/hdf5.build
similarity index 100%
rename from scripts/hdf5.build
rename to scripts/System/hdf5.build
diff --git a/scripts/hdf5_serial.build b/scripts/System/hdf5_serial.build
similarity index 100%
rename from scripts/hdf5_serial.build
rename to scripts/System/hdf5_serial.build
diff --git a/scripts/ippl.build b/scripts/System/ippl.build
similarity index 100%
rename from scripts/ippl.build
rename to scripts/System/ippl.build
diff --git a/scripts/libungif.build b/scripts/System/libungif.build
similarity index 100%
rename from scripts/libungif.build
rename to scripts/System/libungif.build
diff --git a/scripts/mathlib.build b/scripts/System/mathlib.build
similarity index 100%
rename from scripts/mathlib.build
rename to scripts/System/mathlib.build
diff --git a/scripts/mpc.build b/scripts/System/mpc.build
similarity index 100%
rename from scripts/mpc.build
rename to scripts/System/mpc.build
diff --git a/scripts/mpfr.build b/scripts/System/mpfr.build
similarity index 100%
rename from scripts/mpfr.build
rename to scripts/System/mpfr.build
diff --git a/scripts/nmap.build b/scripts/System/nmap.build
similarity index 100%
rename from scripts/nmap.build
rename to scripts/System/nmap.build
diff --git a/scripts/openmpi.build b/scripts/System/openmpi.build
similarity index 100%
rename from scripts/openmpi.build
rename to scripts/System/openmpi.build
diff --git a/scripts/optPilot.build b/scripts/System/optPilot.build
similarity index 100%
rename from scripts/optPilot.build
rename to scripts/System/optPilot.build
diff --git a/scripts/parmetis.build b/scripts/System/parmetis.build
similarity index 100%
rename from scripts/parmetis.build
rename to scripts/System/parmetis.build
diff --git a/scripts/patchelf.build b/scripts/System/patchelf.build
similarity index 100%
rename from scripts/patchelf.build
rename to scripts/System/patchelf.build
diff --git a/scripts/root.build b/scripts/System/root.build
similarity index 100%
rename from scripts/root.build
rename to scripts/System/root.build
diff --git a/scripts/tiff.build b/scripts/System/tiff.build
similarity index 100%
rename from scripts/tiff.build
rename to scripts/System/tiff.build
diff --git a/scripts/trilinos.build b/scripts/System/trilinos.build
similarity index 100%
rename from scripts/trilinos.build
rename to scripts/System/trilinos.build
diff --git a/scripts/vtk.build b/scripts/System/vtk.build
similarity index 100%
rename from scripts/vtk.build
rename to scripts/System/vtk.build
diff --git a/scripts/Modules.build b/scripts/Tools/Modules.build
similarity index 100%
rename from scripts/Modules.build
rename to scripts/Tools/Modules.build
diff --git a/scripts/dialog.build b/scripts/Tools/dialog.build
similarity index 100%
rename from scripts/dialog.build
rename to scripts/Tools/dialog.build
diff --git a/scripts/emacs.build b/scripts/Tools/emacs.build
similarity index 100%
rename from scripts/emacs.build
rename to scripts/Tools/emacs.build
diff --git a/scripts/global.build b/scripts/Tools/global.build
similarity index 100%
rename from scripts/global.build
rename to scripts/Tools/global.build
diff --git a/scripts/gnuplot.build b/scripts/Tools/gnuplot.build
similarity index 100%
rename from scripts/gnuplot.build
rename to scripts/Tools/gnuplot.build