diff --git a/configure-all b/configure-all
deleted file mode 100755
index aa67aaf0..00000000
--- a/configure-all
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-DIRS="build-icpc-avx build-icpc-avx512 build-clang-avx build-clang-avx-openmp build-clang-avx-openmp-mpi build-clang-avx-mpi"
-
-for D in $DIRS
-do
-  echo $D
-  mkdir -p $D
-  cd $D
-  ../configure-commands $D
-  cd ..
-done
diff --git a/build-all b/scripts/build-all
similarity index 86%
rename from build-all
rename to scripts/build-all
index cff673ab..d9aa8635 100755
--- a/build-all
+++ b/scripts/build-all
@@ -1,11 +1,11 @@
 #!/bin/bash 
+
 DIRS="build-clang-avx build-clang-avx-openmp build-clang-avx-openmp-mpi build-clang-avx-mpi build-icpc-avx512 build-icpc-avx "
 
 for D in $DIRS
 do
   echo $D
-  mkdir -p $D
-  cd $D
+  cd builds/$D
   make clean all -j 8
-  cd ..
+  cd ../../
 done
diff --git a/scripts/configure-all b/scripts/configure-all
new file mode 100755
index 00000000..1f9e758a
--- /dev/null
+++ b/scripts/configure-all
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+DIRS="clang-avx clang-avx-openmp clang-avx-openmp-mpi clang-avx-mpi clang-avx2 clang-avx2-openmp clang-avx2-openmp-mpi clang-avx2-mpi icpc-avx icpc-avx2 icpc-avx512 g++-sse4 g++-avx"
+
+for D in $DIRS
+do
+  echo $D
+  mkdir -p builds/$D
+  cd builds/$D
+  ../../configure-commands $D
+  cd ../..
+done
diff --git a/configure-commands b/scripts/configure-commands
similarity index 51%
rename from configure-commands
rename to scripts/configure-commands
index 19d50a4d..183f9915 100755
--- a/configure-commands
+++ b/scripts/configure-commands
@@ -2,28 +2,46 @@
 WD=$1
 echo $WD
 case $WD in
-build-g++-sse4)
+g++-sse4)
   CXX=g++-5 ../configure --enable-simd=SSE4 CXXFLAGS="-msse4 -O3 -std=c++11" --enable-comms=none
   ;;
-build-icpc-avx)
+g++-avx)
+  CXX=g++-5 ../configure --enable-simd=AVX CXXFLAGS="-mavx -O3 -std=c++11" --enable-comms=none
+  ;;
+icpc-avx)
   CXX=icpc ../configure --enable-simd=AVX CXXFLAGS="-mavx -O3 -std=c++11" --enable-comms=none
   ;;
-build-icpc-avx512)
+icpc-avx2)
+  CXX=icpc ../configure --enable-simd=AVX2 CXXFLAGS="-mavx2 -mfma -O3 -std=c++11" --enable-comms=none
+  ;;
+icpc-avx512)
   CXX=icpc ../configure --enable-simd=AVX512 CXXFLAGS="-xCOMMON-AVX512 -O3  -std=c++11" --host=none  --enable-comms=none
   ;;
-build-icpc-mic)
+icpc-mic)
   CXX=icpc ../configure --host=none --enable-simd=AVX512 CXXFLAGS="-mmic -O3  -std=c++11" LDFLAGS=-mmic --enable-comms=none
   ;;
-build-clang-avx)
+clang-avx)
 CXX=clang++ ../configure --enable-simd=AVX CXXFLAGS="-mavx -O3 -std=c++11"  --enable-comms=none
   ;;
-build-clang-avx-openmp)
+clang-avx2)
+CXX=clang++ ../configure --enable-simd=AVX2 CXXFLAGS="-mavx2 -mfma -O3 -std=c++11"  --enable-comms=none
+  ;;
+clang-avx-openmp)
 CXX=clang-omp++ ../configure --enable-simd=AVX CXXFLAGS="-mavx -fopenmp -O3 -std=c++11" LDFLAGS="-fopenmp"  --enable-comms=none
   ;;
-build-clang-avx-openmp-mpi)
+clang-avx2-openmp)
+CXX=clang-omp++ ../configure --enable-simd=AVX2 CXXFLAGS="-mavx2 -mfma -fopenmp -O3 -std=c++11" LDFLAGS="-fopenmp"  --enable-comms=none
+  ;;
+clang-avx-openmp-mpi)
 CXX=clang-omp++ ../configure --enable-simd=AVX CXXFLAGS="-mavx -fopenmp -O3 -I/opt/local/include/openmpi-mp/ -std=c++11" LDFLAGS=-L/opt/local/lib/openmpi-mp/ LIBS="-lmpi -lmpi_cxx -fopenmp"  --enable-comms=mpi
 ;;
-build-clang-avx-mpi)
+clang-avx2-openmp-mpi)
+CXX=clang-omp++ ../configure --enable-simd=AVX2 CXXFLAGS="-mavx2 -mfma -fopenmp -O3 -I/opt/local/include/openmpi-mp/ -std=c++11" LDFLAGS=-L/opt/local/lib/openmpi-mp/ LIBS="-lmpi -lmpi_cxx -fopenmp"  --enable-comms=mpi
+;;
+clang-avx-mpi)
 CXX=clang++ ../configure --enable-simd=AVX CXXFLAGS="-mavx -O3 -I/opt/local/include/openmpi-mp/ -std=c++11" LDFLAGS=-L/opt/local/lib/openmpi-mp/ LIBS="-lmpi -lmpi_cxx "  --enable-comms=mpi
 ;;
+clang-avx2-mpi)
+CXX=clang++ ../configure --enable-simd=AVX2 CXXFLAGS="-mavx2 -mfma -O3 -I/opt/local/include/openmpi-mp/ -std=c++11" LDFLAGS=-L/opt/local/lib/openmpi-mp/ LIBS="-lmpi -lmpi_cxx "  --enable-comms=mpi
+;;
 esac
diff --git a/configure-mic b/scripts/configure-mic
similarity index 100%
rename from configure-mic
rename to scripts/configure-mic