diff --git a/Build/Scripts/HYPRE/build_hypre.bat b/Build/Scripts/HYPRE/build_hypre.bat
index 079e6dbb2b7..6722859ea20 100644
--- a/Build/Scripts/HYPRE/build_hypre.bat
+++ b/Build/Scripts/HYPRE/build_hypre.bat
@@ -1,6 +1,6 @@
 @echo off
-set INSTALLDIR=hypre-2.31.0
-set HYPREVERSION=v2.31.0
+set HYPREVERSION=2.31.0
+set HYPRETAG=v2.31.0
 
 call :getopts %*
 if %stopscript% == 1 exit /b
@@ -22,11 +22,16 @@ cd %CURDIR%
 
 set LIBS=%FIREMODELS%\libs
 if not exist %LIBS% mkdir %LIBS%
-if not exist %LIBS% echo failed to create LIBS directory
+if not exist %LIBS% echo failed to create %LIBS% directory
 if not exist %LIBS% exit
+
 cd %LIBS%
 set LIBS=%CD%
-set INSTALLDIR=%LIBS%\%INSTALLDIR%
+if not exist %LIBS%\hypre mkdir %LIBS%\hypre
+if not exist %LIBS%\hypre echo failed to create %LIBS%\hypre directory
+if not exist %LIBS%\hypre exit
+
+set INSTALLDIR=%LIBS%\hypre\%HYPREVERSION%
 cd %CURDIR%
 
 echo ----------------------------------------------------------
@@ -55,11 +60,11 @@ echo.
   cd hypre
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
-echo checking out version %HYPREVERSION%
+echo checking out tag %HYPRETAG%
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
-  git checkout %HYPREVERSION%
+  git checkout %HYPRETAG%
 
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
@@ -89,7 +94,7 @@ git clean -dxf
 :: configure hypre
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
-echo configuring hypre version %HYPREVERSION%
+echo configuring hypre version %HYPRETAG%
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
@@ -106,7 +111,7 @@ cmake ..\  ^
 :: build and install hypre
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
-echo building and installing hypre version %HYPREVERSION%
+echo building and installing hypre version %HYPRETAG%
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
@@ -133,7 +138,7 @@ echo.
 
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
-echo hypre version %HYPREVERSION% installed in %INSTALLDIR%
+echo hypre version %HYPRETAG% installed in %INSTALLDIR%
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
diff --git a/Build/Scripts/SUNDIALS/.gitignore b/Build/Scripts/SUNDIALS/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/Build/Scripts/SUNDIALS/build_sundials.bat b/Build/Scripts/SUNDIALS/build_sundials.bat
index 906b4419053..71a5a37e0b7 100644
--- a/Build/Scripts/SUNDIALS/build_sundials.bat
+++ b/Build/Scripts/SUNDIALS/build_sundials.bat
@@ -1,6 +1,6 @@
 @echo off
-set INSTALLDIR=sundials-6.7.0
-set SUNDIALSVERSION=v6.7.0
+set SUNDIALSVERSION=6.7.0
+set SUNDIALSTAG=v6.7.0
 
 call :getopts %*
 if %stopscript% == 1 exit /b
@@ -31,11 +31,15 @@ cd %CURDIR%
 
 set LIBS=%FIREMODELS%\libs
 if not exist %LIBS% mkdir %LIBS%
-if not exist %LIBS% echo failed to create LIBS directory
+if not exist %LIBS% echo failed to create %LIBS% directory
 if not exist %LIBS% exit
+
 cd %LIBS%
+if not exist %LIBS%\sundials mkdir %LIBS%\sundials
+if not exist %LIBS%\sundials echo failed to create %LIBS%\sundials directory
+if not exist %LIBS%\sundials exit
 set LIBS=%CD%
-set INSTALLDIR=%LIBS%\%INSTALLDIR%
+set INSTALLDIR=%LIBS%\sundials\%SUNDIALSVERSION%
 cd %CURDIR%
 
 
@@ -55,11 +59,11 @@ echo.
   cd sundials
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
-echo checking out version %SUNDIALSVERSION%
+echo checking out version %SUNDIALSTAG%
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
-  git checkout %SUNDIALSVERSION%
+  git checkout %SUNDIALSTAG%
   cd %CURDIR%
 :endif1
 
@@ -81,7 +85,7 @@ cd %BUILDDIR%
 :: configure sundials
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
-echo configuring sundials version %SUNDIALSVERSION%
+echo configuring sundials version %SUNDIALSTAG%
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
@@ -104,7 +108,7 @@ cmake ..\  ^
 :: build and install sundials
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
-echo building sundials version %SUNDIALSVERSION%
+echo building sundials version %SUNDIALSTAG%
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
@@ -112,7 +116,7 @@ call make
 
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
-echo installing sundials version %SUNDIALSVERSION% in %INSTALLDIR%
+echo installing sundials version %SUNDIALSTAG% in %INSTALLDIR%
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
@@ -139,7 +143,7 @@ echo.
 
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
-echo sundials version %SUNDIALSVERSION% installed in %INSTALLDIR%
+echo sundials version %SUNDIALSTAG% installed in %INSTALLDIR%
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.