diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_cube_bcs.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_cube_bcs.py
index ba70f4455..cc99c7137 100755
--- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_cube_bcs.py
+++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_cube_bcs.py
@@ -11,16 +11,16 @@
 #SBATCH --error={EXPDIR}/{OUTDIR}/logs/{BCNAME2}.err
 #SBATCH --account={account}
 #SBATCH --time=12:00:00
-#SBATCH --ntasks=28
+#SBATCH --nodes=1
 #SBATCH --job-name={BCNAME2}.j
-#SBATCH --constraint=sky
+#SBATCH --constraint=sky|cas
 
 cd {BCDIR}
 
 if ( {STEP1} == True ) then
   /bin/ln -s {bin_dir}
 
-  mkdir -p til rst data/MOM5 data/MOM6 clsm/plots
+  mkdir -p geometry land til rst data/MOM5 data/MOM6 clsm/plots
 
   ln -s {MAKE_BCS_INPUT_DIR}/ocean/MOM5/360x200 data/MOM5/360x200
   ln -s {MAKE_BCS_INPUT_DIR}/ocean/MOM5/720x410 data/MOM5/720x410
@@ -167,11 +167,35 @@
 /bin/mv rst CF{NC}x6C_{DATENAME}{IMO}x{POLENAME}{JMO}
 /bin/mv til CF{NC}x6C_{DATENAME}{IMO}x{POLENAME}{JMO}
 /bin/mv {BCJOB} CF{NC}x6C_{DATENAME}{IMO}x{POLENAME}{JMO}/.
+
 cd ../../
+
 /bin/mv    {BCDIR}/{BCNAME} .
 /bin/mv    {BCJOB}                {BCNAME}
 /bin/mv    {EXPDIR}/{OUTDIR}/logs {BCNAME}/.
 /bin/mv    {BCNAME}/clsm/mkCatchParam.log {BCNAME}/logs/mkCatchParam.log
+
+mkdir -p {BCNAME}/geometry/CF{NC}x6C_{DATENAME}{IMO}x{POLENAME}{JMO}
+mkdir -p {BCNAME}/land/CF{NC}x6C_{DATENAME}{IMO}x{POLENAME}{JMO}
+
+/bin/mv  {BCNAME}/logs  {BCNAME}/land/CF{NC}x6C_{DATENAME}{IMO}x{POLENAME}{JMO}/logs
+/bin/mv  {BCNAME}/CF{NC}x6C_{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter.til  {BCNAME}/geometry/CF{NC}x6C_{DATENAME}{IMO}x{POLENAME}{JMO}/.
+
+
+/bin/mv  {BCNAME}/clsm               {BCNAME}/land/CF{NC}x6C_{DATENAME}{IMO}x{POLENAME}{JMO}/.
+/bin/mv  {BCNAME}/irrigation_{RC}.dat  \
+         {BCNAME}/vegdyn_{RC}.dat      \
+         {BCNAME}/nirdf_{RC}.dat       \
+         {BCNAME}/visdf_{RC}.dat       \
+         {BCNAME}/lai_clim_{RC}.data   \
+         {BCNAME}/green_clim_{RC}.data \
+         {BCNAME}/lnfm_clim_{RC}.data  \
+         {BCNAME}/ndvi_clim_{RC}.data  \
+         {BCNAME}/land/CF{NC}x6C_{DATENAME}{IMO}x{POLENAME}{JMO}/.
+
+/bin/mv {BCNAME}/rst {BCNAME}/til {BCNAME}/geometry/CF{NC}x6C_{DATENAME}{IMO}x{POLENAME}{JMO}/.
+/bin/mv  {BCNAME}/CF{NC}x6C_{DATENAME}{IMO}x{POLENAME}{JMO}.j {BCNAME}/geometry/CF{NC}x6C_{DATENAME}{IMO}x{POLENAME}{JMO}/.
+
 /bin/rm -r {OUTDIR}
 
 endif  # STEP2
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_ease_bcs.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_ease_bcs.py
index b43cd5324..25b53fceb 100755
--- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_ease_bcs.py
+++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_ease_bcs.py
@@ -12,17 +12,15 @@
 #SBATCH --error={EXPDIR}/{OUTDIR}/logs/{BCNAME}.err
 #SBATCH --account={account}
 #SBATCH --time=12:00:00
-#SBATCH --ntasks=28
+#SBATCH --node=1
 #SBATCH --job-name={BCNAME}.j
-#SBATCH --constraint=sky
+#SBATCH --constraint=sky|cas
 
 cd {BCDIR}
 
 /bin/ln -s {bin_dir}
 source bin/g5_modules
-mkdir -p til rst data/MOM5 data/MOM6 clsm/plots
-cd data 
-cd ../
+mkdir -p geometry land til rst data/MOM5 data/MOM6 clsm/plots
 limit stacksize unlimited
 
 setenv MASKFILE {MASKFILE}
@@ -91,6 +89,27 @@
 /bin/mv    {EXPDIR}/{OUTDIR}/logs   {BCNAME}/.
 /bin/mv    {BCNAME}/clsm/mkCatchParam.log {BCNAME}/logs/mkCatchParam.log
 
+mkdir -p {BCNAME}/geometry/{EASEVERSION}_{HRCODE}
+mkdir -p {BCNAME}/land/{EASEVERSION}_{HRCODE}
+
+/bin/mv  {BCNAME}/logs  {BCNAME}/land/{EASEVERSION}_{HRCODE}/logs
+/bin/mv  {BCNAME}/{EASEVERSION}_{HRCODE}_{RS}.til  {BCNAME}/geometry/{EASEVERSION}_{HRCODE}/.
+
+
+/bin/mv  {BCNAME}/clsm               {BCNAME}/land/{EASEVERSION}_{HRCODE}/.
+/bin/mv  {BCNAME}/irrigation_{RS}_DE.dat  \
+         {BCNAME}/vegdyn_{RS}_DE.dat      \
+         {BCNAME}/nirdf_{RS}_DE.dat       \
+         {BCNAME}/visdf_{RS}_DE.dat       \
+         {BCNAME}/lai_clim_{RS}_DE.data   \
+         {BCNAME}/green_clim_{RS}_DE.data \
+         {BCNAME}/lnfm_clim_{RS}_DE.data  \
+         {BCNAME}/ndvi_clim_{RS}_DE.data  \
+         {BCNAME}/land/{EASEVERSION}_{HRCODE}/.
+
+/bin/mv {BCNAME}/rst {BCNAME}/til {BCNAME}/geometry/{EASEVERSION}_{HRCODE}/.
+/bin/mv {BCNAME}/{BCNAME}.j {BCNAME}/geometry/{EASEVERSION}_{HRCODE}/.
+
 """
 
 def make_ease_bcs(config):
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_latlon_bcs.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_latlon_bcs.py
index 9097af6ac..20140029d 100755
--- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_latlon_bcs.py
+++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_latlon_bcs.py
@@ -12,14 +12,14 @@
 #SBATCH --error={EXPDIR}/{OUTDIR}/logs/{BCNAME}.err
 #SBATCH --account={account}
 #SBATCH --time=12:00:00
-#SBATCH --ntasks=28
+#SBATCH --nodes=1
 #SBATCH --job-name={BCNAME}.j
-#SBATCH --constraint=sky
+#SBATCH --constraint=sky|cas
 
 cd {BCDIR}
 /bin/ln -s {bin_dir}
 source bin/g5_modules
-mkdir -p til rst data/MOM5 data/MOM6 clsm/plots
+mkdir -p  geometry land til rst data/MOM5 data/MOM6 clsm/plots
 ln -s {MAKE_BCS_INPUT_DIR}/ocean/MOM5/360x200 data/MOM5/360x200
 ln -s {MAKE_BCS_INPUT_DIR}/ocean/MOM5/720x410 data/MOM5/720x410
 ln -s {MAKE_BCS_INPUT_DIR}/ocean/MOM5/1440x1080 data/MOM5/1440x1080
@@ -127,6 +127,28 @@
 /bin/mv    {BCJOB}                {BCNAME}
 /bin/mv    {EXPDIR}/{OUTDIR}/logs  {BCNAME}/.
 /bin/mv    {BCNAME}/clsm/mkCatchParam.log {BCNAME}/logs/mkCatchParam.log
+
+mkdir -p {BCNAME}/geometry/DC{IM}xPC{JM}_{DATENAME}{IMO}x{POLENAME}{JMO}
+mkdir -p {BCNAME}/land/DC{IM}xPC{JM}_{DATENAME}{IMO}x{POLENAME}{JMO}
+
+/bin/mv  {BCNAME}/logs  {BCNAME}/land/DC{IM}xPC{JM}_{DATENAME}{IMO}x{POLENAME}{JMO}/logs
+/bin/mv  {BCNAME}/DC{IM}xPC{JM}_{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter.til  {BCNAME}/geometry/DC{IM}xPC{JM}_{DATENAME}{IMO}x{POLENAME}{JMO}/.
+
+
+/bin/mv  {BCNAME}/clsm               {BCNAME}/land/DC{IM}xPC{JM}_{DATENAME}{IMO}x{POLENAME}{JMO}/.
+/bin/mv  {BCNAME}/irrigation_{RS}_DC.dat \
+         {BCNAME}/vegdyn_{RS}_DC.dat \
+         {BCNAME}/nirdf_{RS}_DC.dat \
+         {BCNAME}/visdf_{RS}_DC.dat \
+         {BCNAME}/lai_clim_{RS}_DC.data \
+         {BCNAME}/green_clim_{RS}_DC.data \
+         {BCNAME}/lnfm_clim_{RS}_DC.data \
+         {BCNAME}/ndvi_clim_{RS}_DC.data \
+         {BCNAME}/land/DC{IM}xPC{JM}_{DATENAME}{IMO}x{POLENAME}{JMO}/.
+
+/bin/mv {BCNAME}/rst {BCNAME}/til {BCNAME}/geometry/DC{IM}xPC{JM}_{DATENAME}{IMO}x{POLENAME}{JMO}/.
+/bin/mv   {BCNAME}/DC{IM}xPC{JM}_{DATENAME}{IMO}x{POLENAME}{JMO}.j {BCNAME}/geometry/DC{IM}xPC{JM}_{DATENAME}{IMO}x{POLENAME}{JMO}/.
+
 /bin/rm -r {OUTDIR}
 
 """