diff --git a/.gitignore b/.gitignore
index b74b6e9..ea32d5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,6 @@ old
 exec
 bin
 libFMS
+nceplibs
 *.out
 .lib*
diff --git a/Build/BUILDlibfms b/Build/BUILDlibfms
new file mode 100755
index 0000000..5284070
--- /dev/null
+++ b/Build/BUILDlibfms
@@ -0,0 +1,78 @@
+#!/bin/bash
+#***********************************************************************
+#*                   GNU Lesser General Public License
+#*
+#* This file is part of the SHiELD Build System.
+#*
+#* The SHiELD Build System free software: you can redistribute it
+#* and/or modify it under the terms of the
+#* GNU Lesser General Public License as published by the
+#* Free Software Foundation, either version 3 of the License, or
+#* (at your option) any later version.
+#*
+#* The SHiELD Build System distributed in the hope that it will be
+#* useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+#* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#* See the GNU General Public License for more details.
+#*
+#* You should have received a copy of the GNU Lesser General Public
+#* License along with theSHiELD Build System
+#* If not, see <http://www.gnu.org/licenses/>.
+#***********************************************************************
+#
+#  DISCLAIMER: This script is provided as-is and as such is unsupported.
+#
+
+#
+# set default values
+# configure your build parameters
+  compiler="intel"
+#
+# parse arguments
+  for arg in "$@"
+  do
+      case $arg in
+          intel|gnu)
+             compiler="${arg#*=}"
+             shift # Remove "compiler" from processing
+             ;;
+          *)
+          if [ ${arg#} != '--help' ] && [ ${arg#} != '-h' ] ; then
+            echo "option "${arg#}" not found"
+          fi
+          echo -e ' '
+          echo -e "valid options are:"
+          echo -e "\t[intel(D) | gnu] \t\t\t compiler"
+          echo -e "\n"
+          exit
+          ;;
+      esac
+  done
+
+#
+# set up some default variables if not called from COMPILE
+# NCEP_DIR is set if this script is called from the COMPILE script
+# EXTERNAL_LIBS is set if using external location for storage of libFMS
+if [ -z ${NCEP_DIR} ] ; then
+   export BUILD_ROOT=${PWD%/*}
+   export SHiELD_SRC=${PWD%/*/*}/SHiELD_SRC/
+   export PATH="${BUILD_ROOT}/mkmf/bin:${BUILD_ROOT}/Build/mk_scripts:${PATH}"
+   export NCEP_DIR=${BUILD_ROOT}/Build
+   if [ ! -z ${EXTERNAL_LIBS} ] ; then
+      export NCEP_DIR=${EXTERNAL_LIBS}
+   fi
+  # load the proper environment for your machine
+   . ${BUILD_ROOT}/site/environment.${compiler}.sh
+fi
+
+#
+# build FMS library
+echo " building ${NCEP_DIR}/libFMS/${compiler}"
+MAKE_libFMS ${compiler}  >> build_libFMS_${compiler}.out 2>&1   # build 32bit and 64bit versions of libFMS
+#
+# test and report on libFMS build success
+if [ $? -ne 0 ] ; then
+  echo ">>> ${NCEPDIR}/libFMS/${compiler} build failed"
+  exit 1
+fi
+echo " libFMS build successful"
diff --git a/Build/BUILDnceplibs b/Build/BUILDnceplibs
new file mode 100755
index 0000000..d61e1cb
--- /dev/null
+++ b/Build/BUILDnceplibs
@@ -0,0 +1,101 @@
+#!/bin/bash
+#***********************************************************************
+#*                   GNU Lesser General Public License
+#*
+#* This file is part of the SHiELD Build System.
+#*
+#* The SHiELD Build System free software: you can redistribute it
+#* and/or modify it under the terms of the
+#* GNU Lesser General Public License as published by the
+#* Free Software Foundation, either version 3 of the License, or
+#* (at your option) any later version.
+#*
+#* The SHiELD Build System distributed in the hope that it will be
+#* useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+#* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#* See the GNU General Public License for more details.
+#*
+#* You should have received a copy of the GNU Lesser General Public
+#* License along with theSHiELD Build System
+#* If not, see <http://www.gnu.org/licenses/>.
+#***********************************************************************
+#
+#  DISCLAIMER: This script is provided as-is and as such is unsupported.
+#
+
+#set default compiler
+compiler="intel"
+
+# parse arguments
+  for arg in "$@"
+  do
+      case $arg in
+          intel|gnu)
+             compiler="${arg#*=}"
+             shift # Remove "compiler" from processing
+             ;;
+	  *)
+          if [ ${arg#} != '--help' ] && [ ${arg#} != '-h' ] ; then
+            echo "option "${arg#}" not found"
+          fi
+          echo -e ' '
+          echo -e "valid options are:"
+          echo -e "\t[intel(D) | gnu] \t\t\t compiler"
+          echo -e "\n"
+          exit
+          ;;
+      esac
+  done
+
+# set up some default variables if not called from COMPILE
+# NCEP_DIR is set if this script is called from the COMPILE script
+# EXTERNAL_LIBS is set if using external location for storage of nceplibs
+if [ -z ${NCEP_DIR} ] ; then
+   BUILD_ROOT=${PWD%/*}
+   NCEP_DIR=${BUILD_ROOT}/Build
+   if [ ! -z ${EXTERNAL_LIBS} ] ; then
+   NCEP_DIR=${EXTERNAL_LIBS}
+   fi
+   # load the proper environment for your machine
+   . ${BUILD_ROOT}/site/environment.${compiler}.sh
+fi
+
+nceplibs_dir=${NCEP_DIR}/nceplibs/${compiler}
+\rm -rf $nceplibs_dir
+
+
+git clone https://github.com/NOAA-EMC/NCEPLIBS-bacio
+pushd NCEPLIBS-bacio
+cmake -DCMAKE_C_STANDARD=99 -DCMAKE_INSTALL_PREFIX=${BUILD_ROOT}/Build/NCEPLIBS-bacio/install .
+make -j8
+make install
+popd
+
+git clone https://github.com/NOAA-EMC/NCEPLIBS-sp
+pushd NCEPLIBS-sp
+cmake -DCMAKE_C_STANDARD=99 -DCMAKE_INSTALL_PREFIX=${BUILD_ROOT}/Build/NCEPLIBS-sp/install .
+make -j8 sp_d
+make install
+popd
+
+git clone https://github.com/NOAA-EMC/NCEPLIBS-w3emc
+pushd NCEPLIBS-w3emc
+cmake -DCMAKE_C_STANDARD=99 -DCMAKE_INSTALL_PREFIX=${BUILD_ROOT}/Build/NCEPLIBS-w3emc/install -DCMAKE_PREFIX_PATH=${BUILD_ROOT}/Build/NCEPLIBS-bacio/install/lib/cmake/bacio/ .
+make -j8 w3emc_d
+make install
+popd
+
+git clone https://github.com/NOAA-EMC/NCEPLIBS-w3nco
+pushd NCEPLIBS-w3nco
+cmake -DCMAKE_C_STANDARD=99 -DCMAKE_INSTALL_PREFIX=${BUILD_ROOT}/Build/NCEPLIBS-w3nco/install .
+make -j8 w3nco_d
+make install
+popd
+
+mkdir -p $nceplibs_dir
+mv ${BUILD_ROOT}/Build/NCEPLIBS-bacio/install/lib/libbacio.a $nceplibs_dir/.
+mv ${BUILD_ROOT}/Build/NCEPLIBS-sp/install/lib64/libsp_d.a $nceplibs_dir/.
+mv ${BUILD_ROOT}/Build/NCEPLIBS-w3emc/install/lib64/libw3emc_d.a $nceplibs_dir/.
+mv ${BUILD_ROOT}/Build/NCEPLIBS-w3nco/install/lib/libw3nco_d.a $nceplibs_dir/.
+
+\rm -rf NCEPLIBS-bacio NCEPLIBS-sp NCEPLIBS-w3emc NCEPLIBS-w3nco
diff --git a/Build/COMPILE b/Build/COMPILE
index 80a351c..c938e84 100755
--- a/Build/COMPILE
+++ b/Build/COMPILE
@@ -11,7 +11,7 @@
 #* (at your option) any later version.
 #*
 #* The SHiELD Build System distributed in the hope that it will be
-#* useful, but WITHOUT ANYWARRANTY; without even the implied warranty
+#* useful, but WITHOUT ANY WARRANTY; without even the implied warranty
 #* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #* See the GNU General Public License for more details.
 #*
@@ -129,6 +129,7 @@ fi
 export BUILD_ROOT=${PWD%/*}
 export SHiELD_SRC=${PWD%/*/*}/SHiELD_SRC/
 export PATH="${BUILD_ROOT}/mkmf/bin:${BUILD_ROOT}/Build/mk_scripts:${PATH}"
+export NCEP_DIR=${BUILD_ROOT}/Build
 
 #
 # load the proper environment for your machine
@@ -151,65 +152,83 @@ sleep 5
 #
 # conditionally clean the build directory
   if [ ${clean} = "cleanall" ] ; then
-     echo " cleaning FMS library and build directory in 2 seconds"
+     echo " cleaning FMS library, nceplibs and build directory in 2 seconds"
      sleep 2
      \rm -rf libFMS/${compiler}/*
-     \rm -rf exec/${config}_${compiler}/*
+     \rm -rf exec/${config}_${hydro}.${comp}.${bit}.${compiler}/*
+     \rm -rf nceplibs/${compiler}/*
   elif [ ${clean} = "clean" ] ; then
      echo " cleaning build directory in 2 seconds"
      sleep 2
-     \rm -rf exec/${config}_${compiler}/*
+     \rm -rf exec/${config}_${hydro}.${comp}.${bit}.${compiler}/*
   fi
 
+# If EXTERNAL_LIBS is set, then the program will use the path defined by
+#    EXTERNAL_LIBS as the location of nceplibs and libFMS
+  if [ ! -z ${EXTERNAL_LIBS} ] ; then
+    echo " External Libraries are being used: ${EXTERNAL_LIBS}"
+    export NCEP_DIR=${EXTERNAL_LIBS}
+  fi
 #
 # check to make sure libFMS exists
-  if [ -d libFMS/${compiler} ] && [ -e libFMS/${compiler}/32bit/libFMS.a ] && [ -e libFMS/${compiler}/64bit/libFMS.a ] ; then
-     echo " pre-built libFMS/${compiler} exists"
+  if [ -d ${NCEP_DIR}/libFMS/${compiler} ] && [ -e ${NCEP_DIR}/libFMS/${compiler}/32bit/libFMS.a ] && \
+     [ -e ${NCEP_DIR}/libFMS/${compiler}/64bit/libFMS.a ] ; then
+     echo " pre-built ${NCEP_DIR}/libFMS/${compiler} exists"
   else
-     echo " libFMS/${compiler} does not exist - building libFMS/${compiler}"
-     MAKE_libFMS ${compiler}  >> build_libFMS_${compiler}.out 2>&1   # build 32bit and 64bit versions of libFMS
-     #
-     # test and report on libFMS build success
+     echo " ${NCEP_DIR}/libFMS/${compiler} does not exist"
+     ./BUILDlibfms ${compiler}
      if [ $? -ne 0 ] ; then
-       echo ">>> libFMS $compiler build failed"
-       exit 2
+        echo ">>> ${NCEP_DIR}/Libfms/${compiler} build failed"
+        exit 2
+     fi
+  fi
+# check to make sure nceplibs exists
+  if [ -d ${NCEP_DIR}/nceplibs/${compiler} ] && [ -e ${NCEP_DIR}/nceplibs/${compiler}/libbacio.a ] && \
+     [ -e ${NCEP_DIR}/nceplibs/${compiler}/libsp_d.a ] && [ -e ${NCEP_DIR}/nceplibs/${compiler}/libw3emc_d.a ] && \
+     [ -e ${NCEP_DIR}/nceplibs/${compiler}/libw3nco_d.a ] ; then
+     echo " pre-built ${NCEP_DIR}/nceplibs/${compiler} exists"
+  else
+     echo " ${NCEP_DIR}/nceplibs/${compiler} does not exist"
+     ./BUILDnceplibs ${compiler}
+     if [ $? -ne 0 ] ; then
+        echo ">>> ${NCEP_DIR}/ncepdir/${compiler} build failed"
+        exit 3
      fi
-     echo " libFMS build successful"
   fi
 
 #
 # ensure the build and final executable locations are available
-  mkdir -p ./exec/${config}_${compiler}
+  mkdir -p ./exec/${config}_${hydro}.${comp}.${bit}.${compiler}
   mkdir -p ./bin/
 
 # build the model
 echo -e "  building ${config} ${hydro} ${comp} ${bit} ${compiler} \t `date`"
   #
   # create the file list for the build
-    mk_paths ${config} ${compiler}                      > build_${config}_${hydro}.${comp}.${bit}.${compiler}.out 2>&1
+    mk_paths ${config} ${hydro} ${comp} ${bit} ${compiler}       > build_${config}_${hydro}.${comp}.${bit}.${compiler}.out 2>&1
     if [ $? -ne 0 ] ; then
        echo ">>> filelist cration failed"
-       exit 3
+       exit 4
     fi
   #
   # create the library makefiles
-    mk_makefile ${config} ${hydro} ${bit} ${compiler}  >> build_${config}_${hydro}.${comp}.${bit}.${compiler}.out 2>&1
+    mk_makefile ${config} ${hydro} ${comp} ${bit} ${compiler}    >> build_${config}_${hydro}.${comp}.${bit}.${compiler}.out 2>&1
     if [ $? -ne 0 ] ; then
        echo ">>> makefile creation failed"
-       exit 4
+       exit 5
     fi
   #
   # build the configuration
-    mk_make ${config} ${comp} ${bit} ${avx} ${compiler}          >> build_${config}_${hydro}.${comp}.${bit}.${compiler}.out 2>&1
+    mk_make ${config} ${hydro} ${comp} ${bit} ${avx} ${compiler} >> build_${config}_${hydro}.${comp}.${bit}.${compiler}.out 2>&1
   #
   # move the executable to an accessible area
-    mv exec/${config}_${compiler}/test.x bin/${config_name}_${hydro}.${comp}.${bit}.${compiler}.x
+    mv exec/${config}_${hydro}.${comp}.${bit}.${compiler}/test.x bin/${config_name}_${hydro}.${comp}.${bit}.${compiler}.x
 
 #
 # test and report on build success
   if [ $? -ne 0 ] ; then
      echo ">>> ${config_name} build ${hydro} ${comp} ${bit} ${compiler} failed"
-     exit 5
+     exit 6
   else
      echo " ${config_name} build ${hydro} ${comp} ${bit} ${compiler} successful"
   fi
diff --git a/Build/mk_scripts/MAKE_libFMS b/Build/mk_scripts/MAKE_libFMS
index 5a33940..2869409 100755
--- a/Build/mk_scripts/MAKE_libFMS
+++ b/Build/mk_scripts/MAKE_libFMS
@@ -52,18 +52,18 @@ cppDefs="-Duse_libMPI -Duse_netCDF -Duse_LARGEFILE -DHAVE_SCHED_GETAFFINITY -DIN
 
 #
 # clean up and create the FMS library directory
-\rm -rf libFMS/${COMPILER}
+\rm -rf ${NCEPDIR}/libFMS/${COMPILER}
 
 #########################
 #---CREATE 32-BIT libFMS
 #########################
 bit="32bit"
-mkdir -p libFMS/${COMPILER}/${bit}
-pushd libFMS/${COMPILER}/${bit}
-(cd ${SHiELD_SRC} ; list_paths -o ${BUILD_ROOT}/Build/libFMS/${COMPILER}/${bit}/pathnames_fms FMS)
+mkdir -p ${NCEP_DIR}/libFMS/${COMPILER}/${bit}
+pushd ${NCEP_DIR}/libFMS/${COMPILER}/${bit}
+(cd ${SHiELD_SRC} ; list_paths -o ${NCEP_DIR}/libFMS/${COMPILER}/${bit}/pathnames_fms FMS)
 mkmf -m Makefile -a ${SHiELD_SRC} -t "${BUILD_ROOT}/${TEMPLATE}" -c "$cppDefs" \
-     -p libFMS.a ${BUILD_ROOT}/Build/libFMS/${COMPILER}/${bit}/pathnames_fms
-echo "building libFMS/${COMPILER}/32bit/libFMS.a..."
+     -p libFMS.a ${NCEP_DIR}/libFMS/${COMPILER}/${bit}/pathnames_fms
+echo "building ${NCEP_DIR}/libFMS/${COMPILER}/32bit/libFMS.a..."
 make -j8 OPENMP=Y AVX=Y 32BIT=Y Makefile libFMS.a >& Build_libFMS.out
 
 #
@@ -81,12 +81,12 @@ popd
 #---CREATE 64-BIT libFMS
 #########################
 bit="64bit"
-mkdir -p libFMS/${COMPILER}/${bit}
-pushd libFMS/${COMPILER}/${bit}
-(cd ${SHiELD_SRC} ; list_paths -o ${BUILD_ROOT}/Build/libFMS/${COMPILER}/${bit}/pathnames_fms FMS)
+mkdir -p ${NCEP_DIR}/libFMS/${COMPILER}/${bit}
+pushd ${NCEP_DIR}/libFMS/${COMPILER}/${bit}
+(cd ${SHiELD_SRC} ; list_paths -o ${NCEP_DIR}/libFMS/${COMPILER}/${bit}/pathnames_fms FMS)
 mkmf -m Makefile -a ${SHiELD_SRC} -t "${BUILD_ROOT}/${TEMPLATE}" -c "$cppDefs" \
-     -p libFMS.a ${BUILD_ROOT}/Build/libFMS/${COMPILER}/${bit}/pathnames_fms
-echo "building libFMS/${COMPILER}/64bit/libFMS.a..."
+     -p libFMS.a ${NCEP_DIR}/libFMS/${COMPILER}/${bit}/pathnames_fms
+echo "building ${NCEP_DIR}/libFMS/${COMPILER}/64bit/libFMS.a..."
 make -j8 OPENMP=Y AVX=Y Makefile libFMS.a >& Build_libFMS.out
 
 #
diff --git a/Build/mk_scripts/mk_make b/Build/mk_scripts/mk_make
index 21cd2e3..066120a 100755
--- a/Build/mk_scripts/mk_make
+++ b/Build/mk_scripts/mk_make
@@ -26,12 +26,14 @@
 #
 ## set default values
 CONFIG="shield"
+HYDRO="nh"
 COMP=""
 BIT="32BIT=Y"
 AVX="Y"
 COMPILER="intel"
 
 bit="32bit"
+comp="prod"
 
 #
 ## parse arguments
@@ -42,7 +44,12 @@ do
           CONFIG="${arg#*=}"
           shift # Remove CONFIG from processing
           ;;
+        nh|hydro|sw)
+          HYDRO="${arg#*=}"
+          shift # remove "hydro" from processing
+          ;;
         prod|repro|debug)
+          comp="${arg#*=}"
           if [ ${arg#} = 'repro' ] ; then
             COMP="REPRO=Y"
           elif [ ${arg#} = 'debug' ] ; then
@@ -74,15 +81,15 @@ module list
 
 $FC --version
 
-NCEPLIBS="../../libFMS/${COMPILER}/${bit}/libFMS.a"
+NCEPLIBS="${NCEP_DIR}/libFMS/${COMPILER}/${bit}/libFMS.a"
 if [ ${CONFIG} = 'shield' ] ; then
   NCEPLIBS+=" ./libgfs.a"
-  NCEPLIBS+=" -L../../nceplibs/${COMPILER}/ -lbacio_4  -lsp_v2.0.2_d  -lw3emc_d  -lw3nco_d"
+  NCEPLIBS+=" -L${NCEP_DIR}/nceplibs/${COMPILER}/ -lbacio  -lsp_d  -lw3emc_d  -lw3nco_d"
 fi
 
 if [ ${CONFIG} = 'shield' ] ; then
-  (cd exec/${CONFIG}_${COMPILER} ; make -j 8 OPENMP=Y ${COMP} AVX=${AVX} -f Makefile_gfs)
+  (cd exec/${CONFIG}_${HYDRO}.${comp}.${bit}.${COMPILER} ; make -j 8 OPENMP=Y ${COMP} AVX=${AVX} -f Makefile_gfs)
 fi
-(cd exec/${CONFIG}_${COMPILER} ; make -j 8 OPENMP=Y NETCDF=3 ${COMP} AVX=${AVX} ${BIT} NCEPLIBS="${NCEPLIBS}" -f Makefile_fv3)
+(cd exec/${CONFIG}_${HYDRO}.${comp}.${bit}.${COMPILER} ; make -j 8 OPENMP=Y NETCDF=3 ${COMP} AVX=${AVX} ${BIT} NCEPLIBS="${NCEPLIBS}" -f Makefile_fv3)
 
 exit 0
diff --git a/Build/mk_scripts/mk_makefile b/Build/mk_scripts/mk_makefile
index 13513a3..4cf4261 100755
--- a/Build/mk_scripts/mk_makefile
+++ b/Build/mk_scripts/mk_makefile
@@ -27,6 +27,7 @@
 ## set default values
 CONFIG="shield"
 HYDRO="nh"
+COMP="prod"
 BIT="32bit"
 COMPILER="intel"
 
@@ -43,6 +44,10 @@ do
         HYDRO="${arg#*=}"
         shift # Remove HYDRO from processing
         ;;
+        prod|repro|debug)
+        COMP="${arg#*=}"
+        shift # remove "comp" from processing
+        ;;
         32bit|64bit)
         BIT="${arg#*=}"
         shift # Remove *bit from processing
@@ -77,19 +82,19 @@ elif [ ${HYDRO} = 'sw' ] ; then
   FV3_cppDefs+=" -DSW_DYNAMICS -DDYNAMICS_ZS"
 fi
 
-pushd exec/${CONFIG}_${COMPILER}/
+pushd exec/${CONFIG}_${HYDRO}.${COMP}.${BIT}.${COMPILER}/
 
 ############################
 #---CREATE MAKEFILES
 ############################
 if [ ${CONFIG} = 'shield' ] ; then
   mkmf -m Makefile_gfs -a ${SHiELD_SRC} -t "${BUILD_ROOT}/${TEMPLATE}" -o "-cpp" -c "${GFS_cppDefs}" \
-           -p libgfs.a ${BUILD_ROOT}/Build/exec/${CONFIG}_${COMPILER}/pathnames_gfs
+           -p libgfs.a ${BUILD_ROOT}/Build/exec/${CONFIG}_${HYDRO}.${COMP}.${BIT}.${COMPILER}/pathnames_gfs
 fi
 
 mkmf -m Makefile_fv3 -a ${SHiELD_SRC} -t "${BUILD_ROOT}/${TEMPLATE}" -c "${FV3_cppDefs}" \
-         -p test.x -o "-I${SHiELD_SRC}/FMS/include -I${BUILD_ROOT}/Build/libFMS/${COMPILER}/${BIT}" \
-          ${BUILD_ROOT}/Build/exec/${CONFIG}_${COMPILER}/pathnames_fv3
+         -p test.x -o "-I${SHiELD_SRC}/FMS/include -I${NCEP_DIR}/libFMS/${COMPILER}/${BIT}" \
+          ${BUILD_ROOT}/Build/exec/${CONFIG}_${HYDRO}.${COMP}.${BIT}.${COMPILER}/pathnames_fv3
 
 ############################
 #---ADD LIBS TO FINAL LINK
diff --git a/Build/mk_scripts/mk_paths b/Build/mk_scripts/mk_paths
index 36cb2d5..ed57f2e 100755
--- a/Build/mk_scripts/mk_paths
+++ b/Build/mk_scripts/mk_paths
@@ -24,6 +24,9 @@
 #
 
 CONFIG="shield"
+HYDRO="nh"
+COMP="prod"
+BIT="32bit"
 COMPILER="intel"
 
 #
@@ -35,6 +38,18 @@ do
         CONFIG="${arg#*=}"
         shift # Remove CONFIG from processing
         ;;
+        nh|hydro|sw)
+        HYDRO="${arg#*=}"
+        shift # remove "hydro" from processing
+        ;;
+        prod|repro|debug)
+        COMP="${arg#*=}"
+        shift # remove "comp" from processing
+        ;;
+        32bit|64bit)
+        BIT="${arg#*=}"
+        shift # remove "bit" from processing
+        ;;
         intel|gnu)
         COMPILER="${arg#*=}"
         shift # Remove COMPILER from processing
@@ -50,21 +65,21 @@ echo $PATH
 pushd ${SHiELD_SRC}
 
 if [ ${CONFIG} = 'solo' ] ; then
-  list_paths -o ${BUILD_ROOT}/Build/exec/${CONFIG}_${COMPILER}/pathnames_fv3 \
+  list_paths -o ${BUILD_ROOT}/Build/exec/${CONFIG}_${HYDRO}.${COMP}.${BIT}.${COMPILER}/pathnames_fv3 \
       GFDL_atmos_cubed_sphere/driver/solo/ \
       GFDL_atmos_cubed_sphere/tools/ \
       GFDL_atmos_cubed_sphere/model/ \
       atmos_drivers/solo/
 
 elif [ ${CONFIG} = 'shield' ] ; then
-  list_paths -o ${BUILD_ROOT}/Build/exec/${CONFIG}_${COMPILER}/pathnames_gfs \
+  list_paths -o ${BUILD_ROOT}/Build/exec/${CONFIG}_${HYDRO}.${COMP}.${BIT}.${COMPILER}/pathnames_gfs \
       GFDL_atmos_cubed_sphere/model/gfdl_cld_mp.F90 \
       GFDL_atmos_cubed_sphere/model/cld_eff_rad.F90 \
       SHiELD_physics/gsmphys/  \
       SHiELD_physics/GFS_layer/ \
       SHiELD_physics/IPD_layer/
 
-  list_paths -o ${BUILD_ROOT}/Build/exec/${CONFIG}_${COMPILER}/pathnames_fv3 \
+  list_paths -o ${BUILD_ROOT}/Build/exec/${CONFIG}_${HYDRO}.${COMP}.${BIT}.${COMPILER}/pathnames_fv3 \
       SHiELD_physics/FV3GFS/ \
       atmos_drivers/SHiELD/atmos_model.F90 \
       FMSCoupler/SHiELD/coupler_main.F90 \
diff --git a/Build/nceplibs/gnu/libbacio_4.a b/Build/nceplibs/gnu/libbacio_4.a
deleted file mode 100644
index b707224..0000000
Binary files a/Build/nceplibs/gnu/libbacio_4.a and /dev/null differ
diff --git a/Build/nceplibs/gnu/libip_d.a b/Build/nceplibs/gnu/libip_d.a
deleted file mode 100644
index dc9be2d..0000000
Binary files a/Build/nceplibs/gnu/libip_d.a and /dev/null differ
diff --git a/Build/nceplibs/gnu/libnemsio_d.a b/Build/nceplibs/gnu/libnemsio_d.a
deleted file mode 100644
index 703bcb4..0000000
Binary files a/Build/nceplibs/gnu/libnemsio_d.a and /dev/null differ
diff --git a/Build/nceplibs/gnu/libsigio_v2.0.1_4.a b/Build/nceplibs/gnu/libsigio_v2.0.1_4.a
deleted file mode 100644
index cc69889..0000000
Binary files a/Build/nceplibs/gnu/libsigio_v2.0.1_4.a and /dev/null differ
diff --git a/Build/nceplibs/gnu/libsp_v2.0.2_d.a b/Build/nceplibs/gnu/libsp_v2.0.2_d.a
deleted file mode 100644
index 22630bf..0000000
Binary files a/Build/nceplibs/gnu/libsp_v2.0.2_d.a and /dev/null differ
diff --git a/Build/nceplibs/gnu/libw3emc_d.a b/Build/nceplibs/gnu/libw3emc_d.a
deleted file mode 100644
index 7aea43b..0000000
Binary files a/Build/nceplibs/gnu/libw3emc_d.a and /dev/null differ
diff --git a/Build/nceplibs/gnu/libw3nco_d.a b/Build/nceplibs/gnu/libw3nco_d.a
deleted file mode 100644
index 8787851..0000000
Binary files a/Build/nceplibs/gnu/libw3nco_d.a and /dev/null differ
diff --git a/Build/nceplibs/intel/libbacio_4.a b/Build/nceplibs/intel/libbacio_4.a
deleted file mode 100644
index 06e904d..0000000
Binary files a/Build/nceplibs/intel/libbacio_4.a and /dev/null differ
diff --git a/Build/nceplibs/intel/libbacio_8.a b/Build/nceplibs/intel/libbacio_8.a
deleted file mode 100644
index 8f78281..0000000
Binary files a/Build/nceplibs/intel/libbacio_8.a and /dev/null differ
diff --git a/Build/nceplibs/intel/libip_d.a b/Build/nceplibs/intel/libip_d.a
deleted file mode 100644
index 9a1f051..0000000
Binary files a/Build/nceplibs/intel/libip_d.a and /dev/null differ
diff --git a/Build/nceplibs/intel/libsp_v2.0.2_d.a b/Build/nceplibs/intel/libsp_v2.0.2_d.a
deleted file mode 100644
index d63b2ba..0000000
Binary files a/Build/nceplibs/intel/libsp_v2.0.2_d.a and /dev/null differ
diff --git a/Build/nceplibs/intel/libw3emc_d.a b/Build/nceplibs/intel/libw3emc_d.a
deleted file mode 100644
index f2422cf..0000000
Binary files a/Build/nceplibs/intel/libw3emc_d.a and /dev/null differ
diff --git a/Build/nceplibs/intel/libw3nco_d.a b/Build/nceplibs/intel/libw3nco_d.a
deleted file mode 100644
index 31094f1..0000000
Binary files a/Build/nceplibs/intel/libw3nco_d.a and /dev/null differ
diff --git a/site/environment.gnu.sh b/site/environment.gnu.sh
index d616e3f..df9c1b4 100755
--- a/site/environment.gnu.sh
+++ b/site/environment.gnu.sh
@@ -35,6 +35,7 @@ if [ `hostname | cut -c1-4` = "gaea" ] || [ `hostname | cut -c1-3` = "nid" ] ; t
    module load gcc/9.2.0
    module load cray-netcdf
    module load craype-hugepages4M
+   module load cmake/3.20.1
 
    # make your compiler selections here
    export FC=ftn
@@ -58,6 +59,7 @@ elif [ `hostname | cut -c1-5` = "Orion" ] ; then
    module load impi/2021.2
    module load netcdf
    module load hdf5
+   module load cmake/3.22.1
 
    export CPATH="${NETCDF}/include:${CPATH}"
    export HDF5=${HDF5_ROOT}
@@ -87,6 +89,7 @@ elif [ `hostname | cut -c1-2` = "fe" ] || [ `hostname | cut -c1` = "x" ] ; then
    module load impi/2020
    module load hdf5/1.10.5
    module load netcdf4/4.7.2
+   module load cmake/3.20.1
 
    export LIBRARY_PATH="${LIBRARY_PATH}:${NETCDF4}/lib:${HDF5}/lib"
    export NETCDF_DIR=${NETCDF4}
@@ -110,6 +113,7 @@ elif [ `hostname | cut -c1` = "h" ] ; then
    module load impi/2020
    module load netcdf/4.7.2
    module load hdf5/1.10.5
+   module load cmake/3.20.1
 
    export LIBRARY_PATH="${LIBRARY_PATH}:${NETCDF}/lib:${HDF5}/lib"
    export NETCDF_DIR=${NETCDF}
@@ -136,6 +140,7 @@ elif [ `hostname | cut -c1-3` = "lsc" ] ; then
    module load impi/2020
    module load netcdf/4.8.0
    module load hdf5/1.12.0
+   module load cmake/3.18.2
 
    export CPATH="${NETCDF_ROOT}/include:${CPATH}"
    export NETCDF_DIR=${NETCDF_ROOT}
diff --git a/site/environment.intel.sh b/site/environment.intel.sh
index e64e7de..14c8baf 100755
--- a/site/environment.intel.sh
+++ b/site/environment.intel.sh
@@ -28,12 +28,14 @@ if [ `hostname | cut -c1-4` = "gaea" ] || [ `hostname | cut -c1-3` = "nid" ] ; t
    echo " gaea environment "
 
    . ${MODULESHOME}/init/sh
-   module unload PrgEnv-pgi
+   module unload PrgEnv-pgi PrgEnv-intel PrgEnv-gnu
    module load   PrgEnv-intel
    module rm intel
+   module rm gcc
    module load intel/19.0.5.281
    module load cray-netcdf
    module load craype-hugepages4M
+   module load cmake/3.20.1
 
    # make your compiler selections here
    export FC=ftn
@@ -57,6 +59,7 @@ elif [ `hostname | cut -c1-5` = "Orion" ] ; then
    module load impi/2020
    module load netcdf
    module load hdf5
+   module load cmake/3.22.1
 
    export CPATH="${NETCDF}/include:${CPATH}"
    export HDF5=${HDF5_ROOT}
@@ -89,6 +92,7 @@ elif [ `hostname | cut -c1-2` = "fe" ] || [ `hostname | cut -c1` = "x" ] ; then
    module load hdf5/1.8.9
    module load netcdf4/4.2.1.1
    module load mvapich2/2.1
+   module load cmake/3.20.1
 
    export LIBRARY_PATH="${LIBRARY_PATH}:${NETCDF4}/lib:${HDF5}/lib"
    export NETCDF_DIR=${NETCDF4}
@@ -111,6 +115,7 @@ elif [ `hostname | cut -c1` = "h" ] ; then
    module load intel/15.1.133
    module load netcdf/4.3.0
    module load hdf5/1.8.14
+   module load cmake/3.20.1
 
    export LIBRARY_PATH="${LIBRARY_PATH}:${NETCDF}/lib:${HDF5}/lib"
    export NETCDF_DIR=${NETCDF}
@@ -138,6 +143,7 @@ elif [ `hostname | cut -c1-3` = "lsc" ] ; then
    module load mpi/2021.5.0
    module load netcdf/4.8.0
    module load hdf5/1.12.0
+   module load cmake/3.18.2
 
    export CPATH="${NETCDF_ROOT}/include:${CPATH}"
    export NETCDF_DIR=${NETCDF_ROOT}