diff --git a/Externals.cfg b/Externals.cfg
index 82dd328f4b..bf8392c149 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -15,14 +15,14 @@ protocol = git
 required = True
 
 [GLDAS]
-tag = gldas_gfsv16_release.v1.2.0
+tag = gldas_gfsv16_release.v1.4.0
 local_path = sorc/gldas.fd
 repo_url = https://github.com/NOAA-EMC/GLDAS.git
 protocol = git
 required = True
 
 [EMC_post]
-tag = upp_gfsv16_release.v1.0.10
+tag = upp_gfsv16_release.v1.0.11
 local_path = sorc/gfs_post.fd
 repo_url = https://github.com/NOAA-EMC/EMC_post.git
 protocol = git
diff --git a/driver/product/change_gfs_downstream_date.sh b/driver/product/change_gfs_downstream_date.sh
index de6d4e65eb..229ccdd845 100755
--- a/driver/product/change_gfs_downstream_date.sh
+++ b/driver/product/change_gfs_downstream_date.sh
@@ -7,8 +7,8 @@ export dir=` pwd `
 export PDY=`date -u +%Y%m%d`
 export PDY1=`expr $PDY - 1`
 
-export olddate=20191230
-export newdate=20200106
+export olddate=20200106
+export newdate=20200712
 
 export gdas=/gpfs/dell1/nco/ops/com/gfs/prod/gdas.${PDY}/${cyc}
 export gdasgp=/gpfs/dell1/nco/ops/com/gfs/prod/gdas.${PDY}/${cyc}/gempak
@@ -44,10 +44,3 @@ sed -i s/envir=prod/envir=para/g  run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_${cyc}
 sed -i s/envir=prod/envir=para/g  run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_${cyc}
 
 done
-
-
-
-
-
-
-
diff --git a/driver/product/change_gfs_downstream_envir.sh b/driver/product/change_gfs_downstream_envir.sh
index 1098b29624..6006797b60 100755
--- a/driver/product/change_gfs_downstream_envir.sh
+++ b/driver/product/change_gfs_downstream_envir.sh
@@ -7,8 +7,8 @@ export dir=` pwd `
 export PDY=`date -u +%Y%m%d`
 export PDY1=`expr $PDY - 1`
 
-export olddate=20191230
-export newdate=20200106
+export olddate=20200106
+export newdate=20200712
 
 export gdas=/gpfs/dell1/nco/ops/com/gfs/prod/gdas.${PDY}/${cyc}
 export gdasgp=/gpfs/dell1/nco/ops/com/gfs/prod/gdas.${PDY}/${cyc}/gempak
@@ -24,19 +24,12 @@ do
  vi run_JGDAS_GEMPAK_dell.sh_${cyc}
  vi run_JGDAS_GEMPAK_META_NCDC_dell.sh_${cyc}
  vi run_JGFS_GEMPAK_dell.sh_${cyc}
-  vi run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_${cyc} 
-  vi run_JGFS_AWIPS_G2_dell.sh_${cyc}   
+ vi run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_${cyc} 
+ vi run_JGFS_AWIPS_G2_dell.sh_${cyc}   
  vi run_JGFS_FBWIND_dell.sh_${cyc} 
  vi run_JGFS_GEMPAK_META_dell.sh_${cyc}
  vi run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_${cyc} 
-  vi run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_${cyc}
+ vi run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_${cyc}
  vi run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_${cyc} 
 
 done
-
-
-
-
-
-
-
diff --git a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_00 b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_00
index 438b36c972..22a3052977 100755
--- a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_00
+++ b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_00
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -104,21 +104,17 @@ export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak}
 export COMINgdas=${COMINgdas:-$(compath.py ${NET}/${envir}/${RUN})}
 
 else
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime
+   export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}                        ### EMC PARA Realtime
 
-# export COMIN=/gpfs/dell1/nco/ops/com/gfs/para/${RUN}.${PDY}/${cyc}/gempak ### NCO PARA Realtime
-# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN}.${PDY}/${cyc}/gempak ### EMC PARA Realtime
-# export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN} ### EMC PARA Realtime
-#  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak   ### Boi PARA
-#  export COMINgdas=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}  ### Boi PARA
-   export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gdas.20200106/00/gempak
-   export COMINgdas=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gdas
 fi
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta
 
 export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)}
 export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)}
 
-export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta
+export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta
 
 export COMOUTukmet=${COMOUT}
 export COMOUTecmwf=${COMOUT}
diff --git a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_06 b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_06
index 4d4e08cd4c..3a84fb338b 100755
--- a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_06
+++ b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_06
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -104,19 +104,17 @@ export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak}
 export COMINgdas=${COMINgdas:-$(compath.py ${NET}/${envir}/${RUN})}
 
 else
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime
+   export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}                        ### EMC PARA Realtime
 
- export COMIN=/gpfs/dell1/nco/ops/com/gfs/para/${RUN}.${PDY}/${cyc}/gempak ### NCO PARA Realtime
-# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN}.${PDY}/${cyc}/gempak ### EMC PARA Realtime
-# export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN} ### EMC PARA Realtime
-#  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak   ### Boi PARA
-#  export COMINgdas=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}  ### Boi PARA
 fi
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta
 
 export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)}
-export COMINecmwf=${COMINecmwf:-$(compath.py nawips/prod/ecmwf)}
+export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)}
 
-export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta
+export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta
 
 export COMOUTukmet=${COMOUT}
 export COMOUTecmwf=${COMOUT}
diff --git a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_12 b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_12
index e698b8d372..b19b9749c9 100755
--- a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_12
+++ b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_12
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -105,21 +105,19 @@ export COMINgdas=${COMINgdas:-$(compath.py ${NET}/${envir}/${RUN})}
 
 else
 
- export COMIN=/gpfs/dell1/nco/ops/com/gfs/para/${RUN}.${PDY}/${cyc}/gempak ### NCO PARA Realtime
-# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN}.${PDY}/${cyc}/gempak ### EMC PARA Realtime
-# export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN} ### EMC PARA Realtime
-#  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak   ### Boi PARA
-#  export COMINgdas=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}  ### Boi PARA
+#   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime
+#   export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}                        ### EMC PARA Realtime
+   export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gdas.20200712/12/atmos/gempak ### Boi PARA Realtime
+   export COMINgdas=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gdas                      ### Boi PARA Realtime
 
-  export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gdas.20200106/12/gempak
-  export COMINgdas=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gdas
 fi
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta
 
 export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)}
-export COMINecmwf=${COMINecmwf:-$(compath.py nawips/prod/ecmwf)}
+export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)}
 
-export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta
+export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta
 
 export COMOUTukmet=${COMOUT}
 export COMOUTecmwf=${COMOUT}
diff --git a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_18 b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_18
index fa20e329ab..683f68e6fa 100755
--- a/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_18
+++ b/driver/product/run_JGDAS_GEMPAK_META_NCDC_dell.sh_18
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -105,18 +105,17 @@ export COMINgdas=${COMINgdas:-$(compath.py ${NET}/${envir}/${RUN})}
 
 else
 
- export COMIN=/gpfs/dell1/nco/ops/com/gfs/para/${RUN}.${PDY}/${cyc}/gempak ### NCO PARA Realtime
-# export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN}.${PDY}/${cyc}/gempak ### EMC PARA Realtime
-# export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/${RUN} ### EMC PARA Realtime
-#  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak   ### Boi PARA
-#  export COMINgdas=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}  ### Boi PARA
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime
+   export COMINgdas=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}                        ### EMC PARA Realtime
+
 fi
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta
 
 export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)}
-export COMINecmwf=${COMINecmwf:-$(compath.py nawips/prod/ecmwf)}
+export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)}
 
-export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta
+export COMOUTncdc=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta
 
 export COMOUTukmet=${COMOUT}
 export COMOUTecmwf=${COMOUT}
diff --git a/driver/product/run_JGDAS_GEMPAK_dell.sh_00 b/driver/product/run_JGDAS_GEMPAK_dell.sh_00
index edeb213770..c17d3cebbc 100755
--- a/driver/product/run_JGDAS_GEMPAK_dell.sh_00
+++ b/driver/product/run_JGDAS_GEMPAK_dell.sh_00
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -103,14 +103,10 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-#  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
-#   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gdas.20200106/${cyc} ### EMC PARA Realtime
-  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gdas.20200106/00
-
+  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/driver/product/run_JGDAS_GEMPAK_dell.sh_06 b/driver/product/run_JGDAS_GEMPAK_dell.sh_06
index 7861f58f7e..847336e6d7 100755
--- a/driver/product/run_JGDAS_GEMPAK_dell.sh_06
+++ b/driver/product/run_JGDAS_GEMPAK_dell.sh_06
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -103,11 +103,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/driver/product/run_JGDAS_GEMPAK_dell.sh_12 b/driver/product/run_JGDAS_GEMPAK_dell.sh_12
index 5f4d5d3496..60feb294c1 100755
--- a/driver/product/run_JGDAS_GEMPAK_dell.sh_12
+++ b/driver/product/run_JGDAS_GEMPAK_dell.sh_12
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -103,11 +103,10 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/driver/product/run_JGDAS_GEMPAK_dell.sh_18 b/driver/product/run_JGDAS_GEMPAK_dell.sh_18
index bde316c389..6079986586 100755
--- a/driver/product/run_JGDAS_GEMPAK_dell.sh_18
+++ b/driver/product/run_JGDAS_GEMPAK_dell.sh_18
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -103,11 +103,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_00 b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_00
index 39752a6bc8..57a42fa416 100755
--- a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_00
+++ b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_00
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -97,13 +97,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-#  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
-  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
 
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_06 b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_06
index afc4938c0b..686ab66dbf 100755
--- a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_06
+++ b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_06
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -97,11 +97,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_12 b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_12
index 621439963f..74291e29a7 100755
--- a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_12
+++ b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_12
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -97,12 +97,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
-  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_18 b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_18
index 4869744f0f..8b5f55a379 100755
--- a/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_18
+++ b/driver/product/run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_18
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -97,11 +97,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_AWIPS_G2_dell.sh_00 b/driver/product/run_JGFS_AWIPS_G2_dell.sh_00
index f0c884db42..ed5abce218 100755
--- a/driver/product/run_JGFS_AWIPS_G2_dell.sh_00
+++ b/driver/product/run_JGFS_AWIPS_G2_dell.sh_00
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -97,12 +97,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-#  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
-  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_AWIPS_G2_dell.sh_06 b/driver/product/run_JGFS_AWIPS_G2_dell.sh_06
index ab0b53efcf..8dd50da89f 100755
--- a/driver/product/run_JGFS_AWIPS_G2_dell.sh_06
+++ b/driver/product/run_JGFS_AWIPS_G2_dell.sh_06
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -97,11 +97,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_AWIPS_G2_dell.sh_12 b/driver/product/run_JGFS_AWIPS_G2_dell.sh_12
index e61c13fb6c..86936c121a 100755
--- a/driver/product/run_JGFS_AWIPS_G2_dell.sh_12
+++ b/driver/product/run_JGFS_AWIPS_G2_dell.sh_12
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200115
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -48,7 +48,7 @@ export fcsthrs=012
 ############################################
 # set envir=para or para to test with data in prod or para
  export envir=para
- export envir=prod
+ export envir=para
 
 export SENDCOM=YES
 export KEEPDATA=YES
@@ -97,13 +97,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
- export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/gfs.20200106/12
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
 
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_AWIPS_G2_dell.sh_18 b/driver/product/run_JGFS_AWIPS_G2_dell.sh_18
index 73ed26aacb..95cd46d306 100755
--- a/driver/product/run_JGFS_AWIPS_G2_dell.sh_18
+++ b/driver/product/run_JGFS_AWIPS_G2_dell.sh_18
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -97,11 +97,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_FBWIND_dell.sh_00 b/driver/product/run_JGFS_FBWIND_dell.sh_00
index 557e3b159f..ea1c655ca3 100755
--- a/driver/product/run_JGFS_FBWIND_dell.sh_00
+++ b/driver/product/run_JGFS_FBWIND_dell.sh_00
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -89,13 +89,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-#  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
-  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
 
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_FBWIND_dell.sh_06 b/driver/product/run_JGFS_FBWIND_dell.sh_06
index 3eed7db0da..0697172eac 100755
--- a/driver/product/run_JGFS_FBWIND_dell.sh_06
+++ b/driver/product/run_JGFS_FBWIND_dell.sh_06
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -89,11 +89,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_FBWIND_dell.sh_12 b/driver/product/run_JGFS_FBWIND_dell.sh_12
index 52fd6cb974..3c0ef2aea5 100755
--- a/driver/product/run_JGFS_FBWIND_dell.sh_12
+++ b/driver/product/run_JGFS_FBWIND_dell.sh_12
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -89,14 +89,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
-export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12
-
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
 
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_FBWIND_dell.sh_18 b/driver/product/run_JGFS_FBWIND_dell.sh_18
index 94f59530d5..9779c94841 100755
--- a/driver/product/run_JGFS_FBWIND_dell.sh_18
+++ b/driver/product/run_JGFS_FBWIND_dell.sh_18
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -89,11 +89,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_GEMPAK_META_dell.sh_00 b/driver/product/run_JGFS_GEMPAK_META_dell.sh_00
index 2d11c96ca6..fbe710e4a8 100755
--- a/driver/product/run_JGFS_GEMPAK_META_dell.sh_00
+++ b/driver/product/run_JGFS_GEMPAK_META_dell.sh_00
@@ -47,7 +47,7 @@ module list
 ##############################################
 # set envir=para or para to test with data in prod or para
  export envir=para
- export envir=prod
+ export envir=para
 
 export SENDCOM=YES
 export KEEPDATA=YES
@@ -111,19 +111,16 @@ if [ $envir = "prod" ] ; then
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak}
   export COMINgempak=${COMINgempak:-${COMROOT}/${NET}/${envir}}
 else
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/gfs.${PDY}/${cyc}/gempak   ### EMC PARA Realtime
-#  export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1                          ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime
+   export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para                             ### EMC PARA Realtime
 
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak   ### Boi PARA
-  export COMINgempak=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}                         ### Boi PARA
 fi
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta
 
 export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)}
 export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)}
 export COMINnam=${COMINnam:-$(compath.py nam/prod/nam)}
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta
-
 if [ ! -f $COMOUT ] ; then
   mkdir -p -m 775 $COMOUT
 fi
diff --git a/driver/product/run_JGFS_GEMPAK_META_dell.sh_06 b/driver/product/run_JGFS_GEMPAK_META_dell.sh_06
index 7f003a02a6..85b2ca0d70 100755
--- a/driver/product/run_JGFS_GEMPAK_META_dell.sh_06
+++ b/driver/product/run_JGFS_GEMPAK_META_dell.sh_06
@@ -14,7 +14,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -111,19 +111,16 @@ if [ $envir = "prod" ] ; then
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak}
   export COMINgempak=${COMINgempak:-${COMROOT}/${NET}/${envir}}
 else
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/gfs.${PDY}/${cyc}/gempak   ### EMC PARA Realtime
-#  export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1                          ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime
+   export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para                             ### EMC PARA Realtime
 
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak   ### Boi PARA
-  export COMINgempak=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}                         ### Boi PARA
 fi
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta
 
 export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)}
-export COMINecmwf=${COMINecmwf:-$(compath.py nawips/prod/ecmwf)}
+export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)}
 export COMINnam=${COMINnam:-$(compath.py nam/prod/nam)}
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta
-
 if [ ! -f $COMOUT ] ; then
   mkdir -p -m 775 $COMOUT
 fi
diff --git a/driver/product/run_JGFS_GEMPAK_META_dell.sh_12 b/driver/product/run_JGFS_GEMPAK_META_dell.sh_12
index 3c73e4d556..194d8e4208 100755
--- a/driver/product/run_JGFS_GEMPAK_META_dell.sh_12
+++ b/driver/product/run_JGFS_GEMPAK_META_dell.sh_12
@@ -14,7 +14,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -111,23 +111,18 @@ if [ $envir = "prod" ] ; then
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak}
   export COMINgempak=${COMINgempak:-${COMROOT}/${NET}/${envir}}
 else
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/gfs.${PDY}/${cyc}/gempak   ### EMC PARA Realtime
-#  export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1                          ### EMC PARA Realtime
-
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak   ### Boi PARA
-  export COMINgempak=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}                         ### Boi PARA
-
-  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12/gempak
-  export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs
+#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime
+#  export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para                             ### EMC PARA Realtime
+   export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gfs.20200712/12/atmos/gempak
+   export COMINgempak=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para
 
 fi
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta
 
 export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)}
-export COMINecmwf=${COMINecmwf:-$(compath.py nawips/prod/ecmwf)}
+export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)}
 export COMINnam=${COMINnam:-$(compath.py nam/prod/nam)}
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta
-
 if [ ! -f $COMOUT ] ; then
   mkdir -p -m 775 $COMOUT
 fi
diff --git a/driver/product/run_JGFS_GEMPAK_META_dell.sh_18 b/driver/product/run_JGFS_GEMPAK_META_dell.sh_18
index 3f92526d64..1d2d7f8605 100755
--- a/driver/product/run_JGFS_GEMPAK_META_dell.sh_18
+++ b/driver/product/run_JGFS_GEMPAK_META_dell.sh_18
@@ -14,7 +14,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -111,19 +111,16 @@ if [ $envir = "prod" ] ; then
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak}
   export COMINgempak=${COMINgempak:-${COMROOT}/${NET}/${envir}}
 else
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1/gfs.${PDY}/${cyc}/gempak   ### EMC PARA Realtime
-#  export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt1                          ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime
+   export COMINgempak=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para                             ### EMC PARA Realtime
 
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak   ### Boi PARA
-  export COMINgempak=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}                         ### Boi PARA
 fi
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta
 
 export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)}
-export COMINecmwf=${COMINecmwf:-$(compath.py nawips/prod/ecmwf)}
+export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)}
 export COMINnam=${COMINnam:-$(compath.py nam/prod/nam)}
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta
-
 if [ ! -f $COMOUT ] ; then
   mkdir -p -m 775 $COMOUT
 fi
diff --git a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_00 b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_00
index 7ae58dded5..4db2ae3e79 100755
--- a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_00
+++ b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_00
@@ -105,14 +105,12 @@ if [ $envir = "prod" ] ; then
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak}
   export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak   ### Boi PARA
-  export COMINgfs=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}
-  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00/gempak
-  export COMINgfs=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime
+   export COMINgfs=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
 
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_06 b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_06
index 084a4ee2a5..f2c8a628a5 100755
--- a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_06
+++ b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_06
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -105,11 +105,12 @@ if [ $envir = "prod" ] ; then
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak}
   export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak   ### Boi PARA
-  export COMINgfs=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime
+   export COMINgfs=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_12 b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_12
index ec370247bd..a5dc8ac0d6 100755
--- a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_12
+++ b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_12
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -105,15 +105,14 @@ if [ $envir = "prod" ] ; then
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak}
   export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak   ### Boi PARA
-  export COMINgfs=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}
-  
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12/gempak
-  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12/nawips
-  export COMINgfs=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12
+#   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime
+#   export COMINgfs=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
+   export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gfs.20200712/12/atmos/gempak    *** Boi PARA realtime
+   export COMINgfs=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gfs.20200712/12/atmos        *** Boi PARA realtime    
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_18 b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_18
index 0927e8ab15..d43f250f5b 100755
--- a/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_18
+++ b/driver/product/run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_18
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -105,11 +105,12 @@ if [ $envir = "prod" ] ; then
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak}
   export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak   ### Boi PARA
-  export COMINgfs=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos/gempak ### EMC PARA Realtime
+   export COMINgfs=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_GEMPAK_dell.sh_00 b/driver/product/run_JGFS_GEMPAK_dell.sh_00
index 627479856a..34a66c4f0e 100755
--- a/driver/product/run_JGFS_GEMPAK_dell.sh_00
+++ b/driver/product/run_JGFS_GEMPAK_dell.sh_00
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -104,7 +104,7 @@ if [ $envir = "prod" ] ; then
 else
 #  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
 #  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
-  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00
+  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200712/00
 fi
 
 export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak
diff --git a/driver/product/run_JGFS_GEMPAK_dell.sh_06 b/driver/product/run_JGFS_GEMPAK_dell.sh_06
index 1cee61b6ea..e96647b4ae 100755
--- a/driver/product/run_JGFS_GEMPAK_dell.sh_06
+++ b/driver/product/run_JGFS_GEMPAK_dell.sh_06
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -102,11 +102,12 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+#  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/gfs.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+   export ILPOST=3
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/driver/product/run_JGFS_GEMPAK_dell.sh_12 b/driver/product/run_JGFS_GEMPAK_dell.sh_12
index e2b1805b6b..80b510d321 100755
--- a/driver/product/run_JGFS_GEMPAK_dell.sh_12
+++ b/driver/product/run_JGFS_GEMPAK_dell.sh_12
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -102,11 +102,12 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+#  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/gfs.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+   export ILPOST=3
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/driver/product/run_JGFS_GEMPAK_dell.sh_18 b/driver/product/run_JGFS_GEMPAK_dell.sh_18
index 869434632d..56b8f12498 100755
--- a/driver/product/run_JGFS_GEMPAK_dell.sh_18
+++ b/driver/product/run_JGFS_GEMPAK_dell.sh_18
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -102,11 +102,12 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+#  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/gfs.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+   export ILPOST=3
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_00 b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_00
index ab3c65dbb9..c4e350541d 100755
--- a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_00
+++ b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_00
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 export PDY1=`expr $PDY - 1`
 
 export cyc=00
@@ -113,16 +113,13 @@ export NET=gfs
 if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}}
-  export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/prod/gfs.20200106/00
+  export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/prod/gfs.20200712/00
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00
-   export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gfs.20200106/00
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
 
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/gempak
+export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/atmos/gempak
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
@@ -139,4 +136,4 @@ cd $DATA
 #############################################
 # run the GFS job
 #############################################
-sh $HOMEgfs/jobs/JGFS_PGRB2_SPEC_GEMPAK1
+sh $HOMEgfs/jobs/JGFS_PGRB2_SPEC_GEMPAK
diff --git a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_06 b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_06
index 8af385c50d..ab9c5878bc 100755
--- a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_06
+++ b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_06
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 export PDY1=`expr $PDY - 1`
 
 export cyc=06
@@ -114,11 +114,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}}
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/gempak
+export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/atmos/gempak
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_12 b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_12
index 1a2f4e785c..7d6ee6e7c6 100755
--- a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_12
+++ b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_12
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 export PDY1=`expr $PDY - 1`
 
 export cyc=12
@@ -113,14 +113,14 @@ export NET=gfs
 if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}}
-  export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/prod/gfs.20200106/12
+  export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/prod/gfs.20200712/12
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
-  export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gfs.20200106/12
+#   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+   export COMIN=/gpfs/dell2/ptmp/Boi.Vuong/com/gfs/para/gfs.20200712/12/atmos    %%%% Boi PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/gempak
+export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/atmos/gempak
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_18 b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_18
index 705a1fe1fb..9948436f4a 100755
--- a/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_18
+++ b/driver/product/run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_18
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 export PDY1=`expr $PDY - 1`
 
 export cyc=18
@@ -114,11 +114,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}}
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/gempak
+export COMOUT=${COMROOT2}/${NET}/${envir}/${NET}.${PDY}/${cyc}/atmos/gempak
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_00 b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_00
index a62c523c3c..5721194ca2 100755
--- a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_00
+++ b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_00
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -99,13 +99,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-#  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
-  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/00
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
 
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_06 b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_06
index d17be18646..c6b5b6f846 100755
--- a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_06
+++ b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_06
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -99,11 +99,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_12 b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_12
index 69a6341abc..e01df1722c 100755
--- a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_12
+++ b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_12
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -98,14 +98,13 @@ export model=${model:-gfs}
 if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/gfs.20200106/12
+  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/gfs.20200712/12
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
-  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2/gfs.20200106/12
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_18 b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_18
index c84692cbd3..79f8c6c6d3 100755
--- a/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_18
+++ b/driver/product/run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_18
@@ -13,7 +13,7 @@
 export KMP_AFFINITY=disabled
 
 export PDY=`date -u +%Y%m%d`
-export PDY=20200106
+export PDY=20200712
 
 export PDY1=`expr $PDY - 1`
 
@@ -99,11 +99,11 @@ if [ $envir = "prod" ] ; then
 #  This setting is for testing with GFS (production)
   export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}        ### NCO PROD
 else
-  export COMIN=/gpfs/dell2/emc/modeling/noscrub/Boi.Vuong/git/${RUN}.${PDY}/${cyc}    ### Boi PARA
-#  export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/prfv3rt3b/gfs.${PDY}/${cyc} ### EMC PARA Realtime
+   export COMIN=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt2c/gfs/para/${RUN}.${PDY}/${cyc}/atmos ### EMC PARA Realtime
+
 fi
 
-export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}
+export COMOUT=${COMROOT2}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/driver/product/run_gfs_downstream_00Z b/driver/product/run_gfs_downstream_00Z
deleted file mode 100755
index ad3f0cd2bb..0000000000
--- a/driver/product/run_gfs_downstream_00Z
+++ /dev/null
@@ -1,11 +0,0 @@
-set -x
-bsub < run_JGDAS_GEMPAK_dell.sh_00
-bsub < run_JGDAS_GEMPAK_META_NCDC_dell.sh_00
-bsub < run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_00
-bsub < run_JGFS_AWIPS_G2_dell.sh_00   
-bsub < run_JGFS_FBWIND_dell.sh_00 
-bsub < run_JGFS_GEMPAK_META_dell.sh_00
-bsub < run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_00 
-bsub < run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_00
-bsub < run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_00 
-bsub < run_JGFS_GEMPAK_dell.sh_00
diff --git a/driver/product/run_gfs_downstream_06Z b/driver/product/run_gfs_downstream_06Z
deleted file mode 100755
index 85c13a97c8..0000000000
--- a/driver/product/run_gfs_downstream_06Z
+++ /dev/null
@@ -1,12 +0,0 @@
-
-set -x
-bsub < run_JGDAS_GEMPAK_META_NCDC_dell.sh_06
-bsub < run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_06
-bsub < run_JGFS_AWIPS_G2_dell.sh_06
-bsub < run_JGFS_FBWIND_dell.sh_06 
-bsub < run_JGFS_GEMPAK_META_dell.sh_06
-bsub < run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_06 
-bsub < run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_06
-bsub < run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_06 
-bsub < run_JGDAS_GEMPAK_dell.sh_06
-bsub < run_JGFS_GEMPAK_dell.sh_06
diff --git a/driver/product/run_gfs_downstream_12Z b/driver/product/run_gfs_downstream_12Z
deleted file mode 100755
index e0e62cbb93..0000000000
--- a/driver/product/run_gfs_downstream_12Z
+++ /dev/null
@@ -1,11 +0,0 @@
-set -x
-bsub < run_JGDAS_GEMPAK_dell.sh_12
-bsub < run_JGDAS_GEMPAK_META_NCDC_dell.sh_12
-bsub < run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_12
-bsub < run_JGFS_AWIPS_G2_dell.sh_12
-bsub < run_JGFS_FBWIND_dell.sh_12 
-bsub < run_JGFS_GEMPAK_META_dell.sh_12
-bsub < run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_12 
-bsub < run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_12
-bsub < run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_12 
-bsub < run_JGFS_GEMPAK_dell.sh_12
diff --git a/driver/product/run_gfs_downstream_18Z b/driver/product/run_gfs_downstream_18Z
deleted file mode 100755
index 51ac565988..0000000000
--- a/driver/product/run_gfs_downstream_18Z
+++ /dev/null
@@ -1,11 +0,0 @@
-set -x
-bsub < run_JGDAS_GEMPAK_dell.sh_18
-bsub < run_JGDAS_GEMPAK_META_NCDC_dell.sh_18
-bsub < run_JGFS_AWIPS_20KM_1P0DEG_dell.sh_18 
-bsub < run_JGFS_AWIPS_G2_dell.sh_18   
-bsub < run_JGFS_FBWIND_dell.sh_18 
-bsub < run_JGFS_GEMPAK_META_dell.sh_18
-bsub < run_JGFS_GEMPAK_NCDC_UPAPGIF_dell.sh_18 
-bsub < run_JGFS_PGRB2_SPEC_NPOESS_dell.sh_18
-bsub < run_JGFS_PGRB2_SPEC_GEMPAK_dell.sh_18 
-bsub < run_GFS_GEMPAK_dell.sh_18
diff --git a/env/HERA.env b/env/HERA.env
index cfd4edbb94..6031433fd9 100755
--- a/env/HERA.env
+++ b/env/HERA.env
@@ -42,6 +42,8 @@ elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" ]; then
 
     export mpmd="--multi-prog"
     export CFP_MP="YES"
+    if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi
+
 
 elif [ $step = "anal" ]; then
 
diff --git a/env/JET.env b/env/JET.env
index a63222e3b4..2dea123612 100755
--- a/env/JET.env
+++ b/env/JET.env
@@ -37,6 +37,10 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
     export BACK=${BACK:-"YES"}
     export sys_tp="Cray-CS400"
 
+elif [ $step = "waveprep" ]; then
+
+    export MP_PULSE=0
+
 elif [ $step = "anal" ]; then
 
     nth_max=$(($npe_node_max / $npe_node_anal))
diff --git a/env/WCOSS_C.env b/env/WCOSS_C.env
index 8be3f66fe3..93bd98ab60 100755
--- a/env/WCOSS_C.env
+++ b/env/WCOSS_C.env
@@ -37,6 +37,10 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
     export POE=${POE:-"YES"}
     export sys_tp="Cray-XC40"
 
+elif [ $step = "waveprep" ]; then
+
+    export MP_PULSE=0
+
 elif [ $step = "anal" ]; then
 
     nth_max=$(($npe_node_max / $npe_node_anal))
diff --git a/env/WCOSS_DELL_P3.env b/env/WCOSS_DELL_P3.env
index be763c2d90..ef891347d6 100755
--- a/env/WCOSS_DELL_P3.env
+++ b/env/WCOSS_DELL_P3.env
@@ -45,6 +45,10 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
     export BACK=${BACK:-"YES"}
     export sys_tp="Dell-p3"
 
+elif [ $step = "waveprep" ]; then
+
+    export MP_PULSE=0
+
 elif [ $step = "anal" ]; then
 
     nth_max=$(($npe_node_max / $npe_node_anal))
diff --git a/gempak/ush/gdas_meta_loop.sh b/gempak/ush/gdas_meta_loop.sh
index 4d3d9fe128..90c30af771 100755
--- a/gempak/ush/gdas_meta_loop.sh
+++ b/gempak/ush/gdas_meta_loop.sh
@@ -27,6 +27,7 @@ else
    export m_title="GDAS"
 fi
 
+export COMPONENT=${COMPONENT:-atmos}
 export pgm=gdplot2_nc;. prep_step; startmsg
 
 #
@@ -73,8 +74,8 @@ for day in $verdays
         do
 #  Test with GDAS in PROD
 #        grid="${COMROOT}/nawips/${envir}/gdas.${day}/gdas_${day}${cycle}f000"
-         export COMIN=${COMINgdas}.${day}/${cycle}/gempak
-         grid="${COMINgdas}.${day}/${cycle}/gempak/gdas_${day}${cycle}f000"
+         export COMIN=${COMINgdas}.${day}/${cycle}/${COMPONENT}/gempak
+         grid="${COMINgdas}.${day}/${cycle}/${COMPONENT}/gempak/gdas_${day}${cycle}f000"
 
 $GEMEXE/gdplot2_nc << EOF
 \$MAPFIL = mepowo.gsf
@@ -177,8 +178,8 @@ for day in $verdays
         do
 #  Test with GDAS in PROD
 #        grid="${COMROOT}/nawips/${envir}/gdas.${day}/gdas_${day}${cycle}f000"
-         export COMIN=${COMINgdas}.${day}/${cycle}/gempak
-         grid="${COMINgdas}.${day}/${cycle}/gempak/gdas_${day}${cycle}f000"
+         export COMIN=${COMINgdas}.${day}/${cycle}/${COMPONENT}/gempak
+         grid="${COMINgdas}.${day}/${cycle}/${COMPONENT}/gempak/gdas_${day}${cycle}f000"
    
 $GEMEXE/gdplot2_nc << EOF
 \$MAPFIL = mepowo.gsf
diff --git a/gempak/ush/gfs_meta_comp.sh b/gempak/ush/gfs_meta_comp.sh
index 9d53f1a2ee..ff7f31378e 100755
--- a/gempak/ush/gfs_meta_comp.sh
+++ b/gempak/ush/gfs_meta_comp.sh
@@ -31,6 +31,8 @@ mkdir -p -m 775 $DATA/COMP  $DATA/GEMPAK_META_COMP
 cd $DATA/COMP
 cp $FIXgempak/datatype.tbl datatype.tbl
 
+export COMPONENT=${COMPONENT:-atmos}
+
 mdl=gfs
 MDL=GFS
 metatype="comp"
@@ -41,11 +43,11 @@ PDY2=`echo $PDY | cut -c3-`
 #XXW export MODEL=$COMROOT/nawips/prod
 # BV export MODEL=$COMROOT/nawips/${envir}
 # BV export HPCGFS=${MODEL}/${mdl}.$PDY
-export HPCGFS=${COMINgempak}/${mdl}.${PDY}/${cyc}/gempak
-export COMIN00=${COMINgempak}/${mdl}.${PDY}/00/gempak
-export COMIN06=${COMINgempak}/${mdl}.${PDY}/06/gempak
-export COMIN12=${COMINgempak}/${mdl}.${PDY}/12/gempak
-export COMIN18=${COMINgempak}/${mdl}.${PDY}/18/gempak
+export HPCGFS=${COMINgempak}/${mdl}.${PDY}/${cyc}/${COMPONENT}/gempak
+export COMIN00=${COMINgempak}/${mdl}.${PDY}/00/${COMPONENT}/gempak
+export COMIN06=${COMINgempak}/${mdl}.${PDY}/06/${COMPONENT}/gempak
+export COMIN12=${COMINgempak}/${mdl}.${PDY}/12/${COMPONENT}/gempak
+export COMIN18=${COMINgempak}/${mdl}.${PDY}/18/${COMPONENT}/gempak
 if [ ${cyc} -eq 00 ] ; then
    cp $COMIN00/gfs_${PDY}00f* $DATA/GEMPAK_META_COMP
 elif [ ${cyc} -eq 06 ] ; then
@@ -116,7 +118,7 @@ if [ ${cyc} -eq 12 ] ; then
                 desc="Y"
                 #XXW export HPCGFS=${MODEL}/gfs.${PDYm1}
                 # BV export HPCGFS=$COMROOT/nawips/${envir}/gfs.${PDYm1}
-                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak
+                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak
 
                 grid2="F-GFSHPC | ${PDY2m1}/1200"
                 add="24"
@@ -126,7 +128,7 @@ if [ ${cyc} -eq 12 ] ; then
                 desc="Y2"
                 #XXW export HPCGFS=${MODEL}/gfs.${PDYm2}
                 # BV export HPCGFS=$COMROOT/nawips/${esnvir}/gfs.${PDYm2}
-                export HPCGFS=${COMINgempak}/${mdl}.${PDYm2}/${cyc2}/gempak
+                export HPCGFS=${COMINgempak}/${mdl}.${PDYm2}/${cyc2}/${COMPONENT}/gempak
 
                 grid2="F-GFSHPC | ${PDY2m2}/1200"
                 add="48"
@@ -478,7 +480,7 @@ if [ ${cyc} -eq 00 ] ; then
                 cyc2="18"
                 desc="Y"
 # BV            export HPCGFS=${MODEL}/gfs.${PDYm1}
-                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak
+                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak
 
                 grid2="F-GFSHPC | ${PDY2m1}/1800"
                 add="06"
@@ -486,7 +488,7 @@ if [ ${cyc} -eq 00 ] ; then
             elif [ ${runtime} = "12" ] ; then
                 cyc2="12"
                 desc="Y"
-                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak
+                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak
 
                 grid2="F-GFSHPC | ${PDY2m1}/1200"
                 add="12"
@@ -494,7 +496,7 @@ if [ ${cyc} -eq 00 ] ; then
             elif [ ${runtime} = "00y" ] ; then
                 cyc2="00"
                 desc="Y"
-                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak
+                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak
 
                 grid2="F-GFSHPC | ${PDY2m1}/0000"
                 add="24"
@@ -502,7 +504,7 @@ if [ ${cyc} -eq 00 ] ; then
             elif [ ${runtime} = "002d" ] ; then
                 cyc2="00"
                 desc="Y2"
-                export HPCGFS=${COMINgempak}/${mdl}.${PDYm2}/${cyc2}/gempak
+                export HPCGFS=${COMINgempak}/${mdl}.${PDYm2}/${cyc2}/${COMPONENT}/gempak
 
                 grid2="F-GFSHPC | ${PDY2m2}/0000"
                 add="48"
@@ -873,7 +875,7 @@ if [ ${cyc} -eq 18 ] ; then
             elif [ ${runtime} = "18y" ] ; then
                 cyc2="18"
                 desc="Y"
-                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak
+                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak
 
                 grid2="F-GFSHPC | ${PDY2m1}/1800"
                 add="24"
@@ -987,7 +989,7 @@ if [ ${cyc} -eq 06 ] ; then
             elif [ ${runtime} -eq 18 ] ; then
                 cyc2="18"
                 desc="Y"
-                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak
+                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak
 
                 grid2="F-GFSHPC | ${PDY2m1}/1800"
                 add="12"
@@ -995,7 +997,7 @@ if [ ${cyc} -eq 06 ] ; then
             elif [ ${runtime} -eq 12 ] ; then
                 cyc2="12"
                 desc="Y"
-                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak
+                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak
 
                 grid2="F-GFSHPC | ${PDY2m1}/1200"
                 add="18"
@@ -1003,7 +1005,7 @@ if [ ${cyc} -eq 06 ] ; then
             elif [ ${runtime} -eq 06 ] ; then
                 cyc2="06"
                 desc="Y"
-                export HPCGFS=${COMINgempak}/${NET}/${envir}/${mdl}.${PDYm1}/${cyc2}/gempak
+                export HPCGFS=${COMINgempak}/${NET}/${envir}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak
 
                 grid2="F-GFSHPC | ${PDY2m1}/0600"
                 add="24"
diff --git a/gempak/ush/gfs_meta_mar_comp.sh b/gempak/ush/gfs_meta_mar_comp.sh
index e6ca1b6738..c475542131 100755
--- a/gempak/ush/gfs_meta_mar_comp.sh
+++ b/gempak/ush/gfs_meta_mar_comp.sh
@@ -20,6 +20,8 @@ mkdir -p -m 775 $DATA/GEMPAK_META_MAR $DATA/MAR_COMP
 cd $DATA/MAR_COMP
 cp $FIXgempak/datatype.tbl datatype.tbl
 
+export COMPONENT=${COMPONENT:-atmos}
+
 mdl=gfs
 MDL="GFS"
 metatype="mar_comp"
@@ -30,11 +32,11 @@ PDY2=`echo $PDY | cut -c3-`
 # BV export MODEL=/com/nawips/prod
 #XXW export HPCGFS=${MODEL}/${mdl}.$PDY
 # BV export HPCGFS=${COMROOT}/nawips/${envir}/${mdl}.$PDY
-export HPCGFS=${COMINgempak}/${mdl}.${PDY}/${cyc}/gempak
-export COMIN00=${COMINgempak}/${mdl}.${PDY}/00/gempak
-export COMIN06=${COMINgempak}/${mdl}.${PDY}/06/gempak
-export COMIN12=${COMINgempak}/${mdl}.${PDY}/12/gempak
-export COMIN18=${COMINgempak}/${mdl}.${PDY}/18/gempak
+export HPCGFS=${COMINgempak}/${mdl}.${PDY}/${cyc}/${COMPONENT}/gempak
+export COMIN00=${COMINgempak}/${mdl}.${PDY}/00/${COMPONENT}/gempak
+export COMIN06=${COMINgempak}/${mdl}.${PDY}/06/${COMPONENT}/gempak
+export COMIN12=${COMINgempak}/${mdl}.${PDY}/12/${COMPONENT}/gempak
+export COMIN18=${COMINgempak}/${mdl}.${PDY}/18/${COMPONENT}/gempak
 if [ ${cyc} -eq 00 ] ; then
    cp $COMIN00/gfs_${PDY}00f* $DATA/GEMPAK_META_MAR
 elif [ ${cyc} -eq 06 ] ; then
@@ -436,7 +438,7 @@ if [ ${cyc} = "00" ] ; then
                 cyc2="18"
 		#XXW export HPCGFS=${MODEL}/${mdl}.${PDYm1}
 		# BV export HPCGFS=$COMROOT/nawips/${envir}/${mdl}.${PDYm1}
-                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak
+                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak
 
                 grid2="F-GFSHPC | ${PDY2m1}/1800"
                 add="06"
@@ -444,7 +446,7 @@ if [ ${cyc} = "00" ] ; then
             elif [ ${runtime} = "12" ] ; then
                 cyc2="12"
 		#XXW export HPCGFS=${MODEL}/${mdl}.${PDYm1}
-                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak
+                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak
 
                 grid2="F-GFSHPC | ${PDY2m1}/1200"
                 add="12"
@@ -905,7 +907,7 @@ if [ ${cyc} -eq "06" ] ; then
             elif [ ${runtime} = "18" ] ; then
                 cyc2="18"
 		#XXW export HPCGFS=${MODEL}/${mdl}.${PDYm1}
-                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/gempak
+                export HPCGFS=${COMINgempak}/${mdl}.${PDYm1}/${cyc2}/${COMPONENT}/gempak
                 grid2="F-GFSHPC | ${PDY2m1}/1800"
                 add="12"
                 testgfsfhr="72"
diff --git a/gempak/ush/gfs_meta_opc_na_ver b/gempak/ush/gfs_meta_opc_na_ver
index 57da78ce10..ef1ae56d60 100755
--- a/gempak/ush/gfs_meta_opc_na_ver
+++ b/gempak/ush/gfs_meta_opc_na_ver
@@ -14,6 +14,8 @@ mkdir -p -m 775 $DATA/OPC_NA_VER_F${fend}
 cd $DATA/OPC_NA_VER_F${fend}
 cp $FIXgempak/datatype.tbl datatype.tbl
 
+export COMPONENT=${COMPONENT:-atmos}
+
 mdl=gfs
 MDL="GFS"
 metatype="ver"
@@ -147,91 +149,91 @@ for verday in ${verdays}
     cominday=`echo ${verday} | cut -c -8`
     #XXW export HPCGFS=$COMROOT/nawips/prod/${mdl}.${cominday}
     # BV export HPCGFS=$COMROOT/nawips/${envir}/${mdl}.${cominday}
-    export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cyc}/gempak
+    export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cyc}/${COMPONENT}/gempak
 
     if [ ${verday} -eq ${dc1} ] ; then
         dgdattim=f006
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle1}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle1}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate1}/${cycle1}00"
     elif [ ${verday} -eq ${dc2} ] ; then
         dgdattim=f012
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle2}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle2}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate2}/${cycle2}00"
     elif [ ${verday} -eq ${dc3} ] ; then
         dgdattim=f018
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle3}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle3}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate3}/${cycle3}00"
     elif [ ${verday} -eq ${dc4} ] ; then
         dgdattim=f024
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle4}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle4}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate4}/${cycle4}00"
     elif [ ${verday} -eq ${dc5} ] ; then
         dgdattim=f030
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle5}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle5}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate5}/${cycle5}00"
     elif [ ${verday} -eq ${dc6} ] ; then
         dgdattim=f036
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle6}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle6}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate6}/${cycle6}00"
     elif [ ${verday} -eq ${dc7} ] ; then
         dgdattim=f042
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle7}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle7}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate7}/${cycle7}00"
     elif [ ${verday} -eq ${dc8} ] ; then
         dgdattim=f048
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle8}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle8}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate8}/${cycle8}00"
     elif [ ${verday} -eq ${dc9} ] ; then
         dgdattim=f054
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle9}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle9}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate9}/${cycle9}00"
     elif [ ${verday} -eq ${dc10} ] ; then
         dgdattim=f060
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle10}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle10}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate10}/${cycle10}00"
     elif [ ${verday} -eq ${dc11} ] ; then
         dgdattim=f066
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle11}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle11}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate11}/${cycle11}00"
     elif [ ${verday} -eq ${dc12} ] ; then
         dgdattim=f072
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle12}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle12}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate12}/${cycle12}00"
     elif [ ${verday} -eq ${dc13} ] ; then
         dgdattim=f078
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle13}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle13}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate13}/${cycle13}00"
     elif [ ${verday} -eq ${dc14} ] ; then
         dgdattim=f084
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle14}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle14}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate14}/${cycle14}00"
     elif [ ${verday} -eq ${dc15} ] ; then
         dgdattim=f090
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle15}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle15}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate15}/${cycle15}00"
     elif [ ${verday} -eq ${dc16} ] ; then
         dgdattim=f096
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle16}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle16}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate16}/${cycle16}00"
     elif [ ${verday} -eq ${dc17} ] ; then
         dgdattim=f102
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle17}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle17}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate17}/${cycle17}00"
     elif [ ${verday} -eq ${dc18} ] ; then
         dgdattim=f108
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle18}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle18}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate18}/${cycle18}00"
     elif [ ${verday} -eq ${dc19} ] ; then
         dgdattim=f114
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle19}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle19}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate19}/${cycle19}00"
     elif [ ${verday} -eq ${dc20} ] ; then
         dgdattim=f120
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle20}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle20}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate20}/${cycle20}00"
     elif [ ${verday} -eq ${dc21} ] ; then
         dgdattim=f126
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle21}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle21}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate21}/${cycle21}00"
     fi
 
diff --git a/gempak/ush/gfs_meta_opc_np_ver b/gempak/ush/gfs_meta_opc_np_ver
index abb0179707..dfb320ea82 100755
--- a/gempak/ush/gfs_meta_opc_np_ver
+++ b/gempak/ush/gfs_meta_opc_np_ver
@@ -14,6 +14,8 @@ mkdir -p -m 775 $DATA/OPC_NP_VER_F${fend}
 cd $DATA/OPC_NP_VER_F${fend}
 cp $FIXgempak/datatype.tbl datatype.tbl
 #
+export COMPONENT=${COMPONENT:-atmos}
+
 mdl=gfs
 MDL="GFS"
 metatype="ver"
@@ -148,91 +150,91 @@ for verday in ${verdays}
     cominday=`echo ${verday} | cut -c -8`
     #XXW export HPCGFS=$COMROOT/nawips/prod/${mdl}.${cominday}
     # BV export HPCGFS=$COMROOT/nawips/${envir}/${mdl}.${cominday}
-    export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cyc}/gempak
+    export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cyc}/${COMPONENT}/gempak
 
     if [ ${verday} -eq ${dc1} ] ; then
         dgdattim=f006
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle1}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle1}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate1}/${cycle1}00"
     elif [ ${verday} -eq ${dc2} ] ; then
         dgdattim=f012
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle2}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle2}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate2}/${cycle2}00"
     elif [ ${verday} -eq ${dc3} ] ; then
         dgdattim=f018
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle3}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle3}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate3}/${cycle3}00"
     elif [ ${verday} -eq ${dc4} ] ; then
         dgdattim=f024
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle4}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle4}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate4}/${cycle4}00"
     elif [ ${verday} -eq ${dc5} ] ; then
         dgdattim=f030
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle5}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle5}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate5}/${cycle5}00"
     elif [ ${verday} -eq ${dc6} ] ; then
         dgdattim=f036
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle6}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle6}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate6}/${cycle6}00"
     elif [ ${verday} -eq ${dc7} ] ; then
         dgdattim=f042
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle7}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle7}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate7}/${cycle7}00"
     elif [ ${verday} -eq ${dc8} ] ; then
         dgdattim=f048
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle8}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle8}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate8}/${cycle8}00"
     elif [ ${verday} -eq ${dc9} ] ; then
         dgdattim=f054
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle9}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle9}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate9}/${cycle9}00"
     elif [ ${verday} -eq ${dc10} ] ; then
         dgdattim=f060
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle10}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle10}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate10}/${cycle10}00"
     elif [ ${verday} -eq ${dc11} ] ; then
         dgdattim=f066
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle11}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle11}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate11}/${cycle11}00"
     elif [ ${verday} -eq ${dc12} ] ; then
         dgdattim=f072
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle12}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle12}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate12}/${cycle12}00"
     elif [ ${verday} -eq ${dc13} ] ; then
         dgdattim=f078
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle13}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle13}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate13}/${cycle13}00"
     elif [ ${verday} -eq ${dc14} ] ; then
         dgdattim=f084
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle14}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle14}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate14}/${cycle14}00"
     elif [ ${verday} -eq ${dc15} ] ; then
         dgdattim=f090
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle15}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle15}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate15}/${cycle15}00"
     elif [ ${verday} -eq ${dc16} ] ; then
         dgdattim=f096
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle16}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle16}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate16}/${cycle16}00"
     elif [ ${verday} -eq ${dc17} ] ; then
         dgdattim=f102
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle17}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle17}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate17}/${cycle17}00"
     elif [ ${verday} -eq ${dc18} ] ; then
         dgdattim=f108
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle18}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle18}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate18}/${cycle18}00"
     elif [ ${verday} -eq ${dc19} ] ; then
         dgdattim=f114
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle19}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle19}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate19}/${cycle19}00"
     elif [ ${verday} -eq ${dc20} ] ; then
         dgdattim=f120
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle20}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle20}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate20}/${cycle20}00"
     elif [ ${verday} -eq ${dc21} ] ; then
         dgdattim=f126
-        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle21}/gempak
+        export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle21}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate21}/${cycle21}00"
     fi
 
diff --git a/gempak/ush/gfs_meta_sa2.sh b/gempak/ush/gfs_meta_sa2.sh
index b71b158a7b..eab320e4cd 100755
--- a/gempak/ush/gfs_meta_sa2.sh
+++ b/gempak/ush/gfs_meta_sa2.sh
@@ -21,6 +21,8 @@ echo " start with ukmet_gfs_meta_sa2.sh"
 export PS4='SA2:$SECONDS + '
 cp $FIXgempak/datatype.tbl datatype.tbl
 
+export COMPONENT=${COMPONENT:-atmos}
+
 mdl=gfs
 MDL=GFS
 
@@ -44,7 +46,7 @@ fi
 
 PDY2=`echo ${PDY} | cut -c3-`
 # export HPCGFS=$COMROOT/nawips/${envir}/gfs.${PDY}
-export HPCGFS=${COMINgempak}/${mdl}.${PDY}/${cyc}/gempak
+export HPCGFS=${COMINgempak}/${mdl}.${PDY}/${cyc}/${COMPONENT}/gempak
 
 grid1="F-GFSHPC | ${PDY2}/${cyc}00"
 
diff --git a/gempak/ush/gfs_meta_ver.sh b/gempak/ush/gfs_meta_ver.sh
index 2bd9076599..54697264be 100755
--- a/gempak/ush/gfs_meta_ver.sh
+++ b/gempak/ush/gfs_meta_ver.sh
@@ -28,6 +28,8 @@ mkdir -p -m 775 $DATA/VER
 cd $DATA/VER
 cp $FIXgempak/datatype.tbl datatype.tbl
 
+export COMPONENT=${COMPONENT:-atmos}
+
 mdl=gfs
 MDL=GFS
 metatype="ver"
@@ -225,139 +227,139 @@ for verday in ${verdays}
     cominday=`echo ${verday} | cut -c -8`
     #XXW export HPCGFS=$COMROOT/nawips/prod/${mdl}.${cominday}
     # BV export HPCGFS=$COMROOT/nawips/${envir}/${mdl}.${cominday}
-    export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cyc}/gempak
+    export HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cyc}/${COMPONENT}/gempak
 
     if [ ${verday} -eq ${dc1} ] ; then
         dgdattim=f006
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle1}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle1}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate1}/${cycle1}00"
     elif [ ${verday} -eq ${dc2} ] ; then
         dgdattim=f012
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle2}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle2}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate2}/${cycle2}00"
     elif [ ${verday} -eq ${dc3} ] ; then
         dgdattim=f018
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle3}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle3}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate3}/${cycle3}00"
     elif [ ${verday} -eq ${dc4} ] ; then
         dgdattim=f024
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle4}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle4}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate4}/${cycle4}00"
     elif [ ${verday} -eq ${dc5} ] ; then
         dgdattim=f030
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle5}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle5}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate5}/${cycle5}00"
     elif [ ${verday} -eq ${dc6} ] ; then
         dgdattim=f036
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle6}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle6}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate6}/${cycle6}00"
     elif [ ${verday} -eq ${dc7} ] ; then
         dgdattim=f042
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle7}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle7}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate7}/${cycle7}00"
     elif [ ${verday} -eq ${dc8} ] ; then
         dgdattim=f048
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle8}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle8}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate8}/${cycle8}00"
     elif [ ${verday} -eq ${dc9} ] ; then
         dgdattim=f054
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle9}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle9}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate9}/${cycle9}00"
     elif [ ${verday} -eq ${dc10} ] ; then
         dgdattim=f060
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle10}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle10}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate10}/${cycle10}00"
     elif [ ${verday} -eq ${dc11} ] ; then
         dgdattim=f066
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle11}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle11}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate11}/${cycle11}00"
     elif [ ${verday} -eq ${dc12} ] ; then
         dgdattim=f072
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle12}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle12}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate12}/${cycle12}00"
     elif [ ${verday} -eq ${dc13} ] ; then
         dgdattim=f078
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle13}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle13}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate13}/${cycle13}00"
     elif [ ${verday} -eq ${dc14} ] ; then
         dgdattim=f084
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle14}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle14}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate14}/${cycle14}00"
     elif [ ${verday} -eq ${dc15} ] ; then
         dgdattim=f090
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle15}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle15}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate15}/${cycle15}00"
     elif [ ${verday} -eq ${dc16} ] ; then
         dgdattim=f096
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle16}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle16}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate16}/${cycle16}00"
     elif [ ${verday} -eq ${dc17} ] ; then
         dgdattim=f102
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle17}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle17}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate17}/${cycle17}00"
     elif [ ${verday} -eq ${dc18} ] ; then
         dgdattim=f108
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle18}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle18}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate18}/${cycle18}00"
     elif [ ${verday} -eq ${dc19} ] ; then
         dgdattim=f114
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle19}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle19}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate19}/${cycle19}00"
     elif [ ${verday} -eq ${dc20} ] ; then
         dgdattim=f120
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle20}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle20}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate20}/${cycle20}00"
     elif [ ${verday} -eq ${dc21} ] ; then
         dgdattim=f126
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle21}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle21}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate21}/${cycle21}00"
     elif [ ${verday} -eq ${dc22} ] ; then
         dgdattim=f132
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle22}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle22}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate22}/${cycle22}00"
     elif [ ${verday} -eq ${dc23} ] ; then
         dgdattim=f138
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle23}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle23}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate23}/${cycle23}00"
     elif [ ${verday} -eq ${dc24} ] ; then
         dgdattim=f144
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle24}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle24}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate24}/${cycle24}00"
     elif [ ${verday} -eq ${dc25} ] ; then
         dgdattim=f150
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle25}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle25}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate25}/${cycle25}00"
     elif [ ${verday} -eq ${dc26} ] ; then
         dgdattim=f156
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle26}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle26}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate26}/${cycle26}00"
     elif [ ${verday} -eq ${dc27} ] ; then
         dgdattim=f162
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle27}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle27}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate27}/${cycle27}00"
     elif [ ${verday} -eq ${dc28} ] ; then
         dgdattim=f168
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle28}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle28}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate28}/${cycle28}00"
     elif [ ${verday} -eq ${dc29} ] ; then
         dgdattim=f174
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle29}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle29}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate29}/${cycle29}00"
     elif [ ${verday} -eq ${dc30} ] ; then
         dgdattim=f180
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle30}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle30}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate30}/${cycle30}00"
     elif [ ${verday} -eq ${dc31} ] ; then
         dgdattim=f192
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle31}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle31}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate31}/${cycle31}00"
     elif [ ${verday} -eq ${dc32} ] ; then
         dgdattim=f204
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle32}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle32}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate32}/${cycle32}00"
     elif [ ${verday} -eq ${dc33} ] ; then
         dgdattim=f216
-        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle33}/gempak
+        HPCGFS=${COMINgempak}/${mdl}.${cominday}/${cycle33}/${COMPONENT}/gempak
         grid="F-${MDL2} | ${sdate33}/${cycle33}00"
     fi
 
diff --git a/jobs/JGDAS_GEMPAK b/jobs/JGDAS_GEMPAK
index 2ae8d08c3f..5ab6987e3a 100755
--- a/jobs/JGDAS_GEMPAK
+++ b/jobs/JGDAS_GEMPAK
@@ -56,12 +56,13 @@ export DBN_ALERT_TYPE=GDAS_GEMPAK
 export NET=${NET:-gfs}
 export RUN=${RUN:-gdas}
 export model=${model:-gdas}
+export COMPONENT=${COMPONENT:-atmos}
 
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak}
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/jobs/JGDAS_GEMPAK_META_NCDC b/jobs/JGDAS_GEMPAK_META_NCDC
index 6edc4b6eff..b6e411a956 100755
--- a/jobs/JGDAS_GEMPAK_META_NCDC
+++ b/jobs/JGDAS_GEMPAK_META_NCDC
@@ -50,6 +50,7 @@ cp $FIXgempak/datatype.tbl datatype.tbl
 ####################################
 export NET=${NET:-gfs}
 export RUN=${RUN:-gdas}
+export COMPONENT=${COMPONENT:-atmos}
 export MODEL=GDAS
 export GRID_NAME=gdas
 export fend=09
@@ -65,10 +66,10 @@ export DBN_ALERT_TYPE=GDAS_METAFILE
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT/gempak}
 export COMINgdas=${COMINgdas:-$(compath.py ${NET}/${envir}/${RUN})}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta}
-export COMOUTncdc=${COMOUTncdc:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak/meta}
+export COMOUTncdc=${COMOUTncdc:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT}
 
 export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)}
 export COMINecmwf=${COMINecmwf:-$(compath.py ecmwf/prod/ecmwf)}
diff --git a/jobs/JGFS_AWIPS_20KM_1P0DEG b/jobs/JGFS_AWIPS_20KM_1P0DEG
index c05386fe65..bafd73f284 100755
--- a/jobs/JGFS_AWIPS_20KM_1P0DEG
+++ b/jobs/JGFS_AWIPS_20KM_1P0DEG
@@ -44,12 +44,13 @@ export FIXgfs=${FIXgfs:-$HOMEgfs/fix}
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export model=${model:-gfs}
+export COMPONENT=${COMPONENT:-atmos}
 
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT}
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_AWIPS_G2 b/jobs/JGFS_AWIPS_G2
index 6840bff2cc..a661a4f0cf 100755
--- a/jobs/JGFS_AWIPS_G2
+++ b/jobs/JGFS_AWIPS_G2
@@ -45,12 +45,13 @@ export UTILgfs=${UTILgfs:-$HOMEgfs/util}
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export model=${model:-gfs}
+export COMPONENT=${COMPONENT:-atmos}
 
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT}
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_CYCLONE_GENESIS b/jobs/JGFS_CYCLONE_GENESIS
index ad14bea99a..e43edbbaca 100755
--- a/jobs/JGFS_CYCLONE_GENESIS
+++ b/jobs/JGFS_CYCLONE_GENESIS
@@ -53,7 +53,7 @@ setpdy.sh
 ####################################
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-
+export COMPONENT=${COMPONENT:-atmos}
 
 ##############################################
 # Determine Job Output Name on System
@@ -91,10 +91,10 @@ export SCRIPTens_tracker=${SCRIPTens_tracker:-$HOMEens_tracker/scripts}
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}
+export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT
 export gfsdir=${COMIN}
 export COMINgfs=${COMIN}
-export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}
+export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT
 
 export JYYYY=`echo ${PDY} | cut -c1-4`
 export COMINgenvit=${COMINgenvit:-${COMOUT}/genesis_vital_${JYYYY}}
diff --git a/jobs/JGFS_CYCLONE_TRACKER b/jobs/JGFS_CYCLONE_TRACKER
index 1ebab8064a..a26393cb27 100755
--- a/jobs/JGFS_CYCLONE_TRACKER
+++ b/jobs/JGFS_CYCLONE_TRACKER
@@ -53,6 +53,7 @@ setpdy.sh
 ####################################
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
+export COMPONENT=${COMPONENT:-atmos}
 
 
 ##############################################
@@ -92,12 +93,12 @@ export USHens_tracker=${USHens_tracker:-$HOMEens_tracker/ush}
 ##############################################
 # Define COM and Data directories
 ##############################################
-export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}
+export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT
 export COMINgfs=${COMIN}
 export gfsdir=${COMINgfs}
 export COMINgdas=${COMIN}
 export gdasdir=${COMINgdas}
-export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}
+export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT
 export COMINsyn=${COMINsyn:-$(compath.py arch/prod/syndat)}
 
 if [ $RUN_ENVIR = "nco" ]; then
diff --git a/jobs/JGFS_FBWIND b/jobs/JGFS_FBWIND
index abec894b84..c51a077b29 100755
--- a/jobs/JGFS_FBWIND
+++ b/jobs/JGFS_FBWIND
@@ -44,12 +44,13 @@ export UTILgfs=${UTILgfs:-$HOMEgfs/util}
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export model=${model:-gfs}
+export COMPONENT=${COMPONENT:-atmos}
 
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT}
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_FSU_GENESIS b/jobs/JGFS_FSU_GENESIS
index c66b3d1169..f693f01b42 100755
--- a/jobs/JGFS_FSU_GENESIS
+++ b/jobs/JGFS_FSU_GENESIS
@@ -54,6 +54,7 @@ setpdy.sh
 ####################################
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
+export COMPONENT=${COMPONENT:-atmos}
 
 
 ##############################################
@@ -88,18 +89,19 @@ export HOMEens_tracker=${HOMEens_tracker:-${NWROOT:?}/ens_tracker.${ens_tracker_
 export EXECens_tracker=${EXECens_tracker:-$HOMEens_tracker/exec}
 export FIXens_tracker=${FIXens_tracker:-$HOMEens_tracker/fix}
 export USHens_tracker=${USHens_tracker:-$HOMEens_tracker/ush}
-
+export SCRIPTens_tracker=${SCRIPTens_tracker:-$HOMEens_tracker/scripts}
+export BINens_tracker=${BINens_tracker:-$HOMEens_tracker/ush/FSUgenesisPY/bin}
 
 ##############################################
 # Define COM and Data directories
 ##############################################
-export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}
+export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENT}
 export COMINgfs=${COMIN}
 #export gfsdir=${COMINgfs}
 export gfsdir=${ROTDIR}
 export COMINgdas=${COMIN}
 export gdasdir=${COMINgdas}
-export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}
+export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENT}
 export COMINsyn=${COMINsyn:-$(compath.py arch/prod/syndat)}
 
 if [ $RUN_ENVIR = "nco" ]; then
@@ -123,51 +125,9 @@ $LOGSCRIPT
 
 #############################################################
 # Execute the script
-#export pert="p01"
-export cmodel=$CDUMP
-#export loopnum=1
-
-#-----------input data checking -----------------
-#${USHens_tracker}/data_check_gfs.sh
-${USHens_tracker}/data_check_gfs_180hr.sh
-# exit code 6 = missing data of opportunity
-if [ $? -eq 6 ]; then exit; fi
-#------------------------------------------------
-
-machine=${machine:-`echo ${SITE}`}
-if [ $machine = TIDE -o $machine = GYRE ] ; then # For WCOSS
-  machine=wcoss
-#  ${USHens_tracker}/extrkr_gfs.sh ${loopnum} ${cmodel} ${CDATE} ${pert} ${DATA} 
-  ${USHens_tracker}/extrkr_fsu.sh ${cmodel} ${CDATE} ${DATA} ${gfsdir}
-
-elif [ $machine = LUNA -o $machine = SURGE -o $machine = WCOSS_C ] ; then # For CRAY
-  machine=cray
-#  ${APRUNTRACK} ${USHens_tracker}/extrkr_gfs.sh ${loopnum} ${cmodel} ${CDATE} ${pert} ${DATA} 
-  ${APRUNTRACK} ${USHens_tracker}/extrkr_fsu.sh ${cmodel} ${CDATE} ${DATA} ${gfsdir}
-
-elif [ $machine = VENUS -o $machine = MARS -o $machine = WCOSS_DELL_P3 ] ; then # For DELL
-  machine=dell
-#  mpirun -n 1 ${USHens_tracker}/extrkr_gfs.sh ${loopnum} ${cmodel} ${CDATE} ${pert} ${DATA}
-   mpirun -n 1 ${USHens_tracker}/extrkr_fsu.sh ${cmodel} ${CDATE} ${DATA} ${gfsdir}
-
-elif [ $machine = HERA ]; then # For HERA
-  machine=hera
-#  ${USHens_tracker}/extrkr_gfs.sh ${loopnum} ${cmodel} ${CDATE} ${pert} ${DATA}
-  ${USHens_tracker}/extrkr_fsu.sh ${cmodel} ${CDATE} ${DATA} ${gfsdir}
-fi
+${SCRIPTens_tracker}/exgfs_fsu_genesis.sh
 export err=$?; err_chk
 
-
-#if [ "$SENDCOM" = 'YES' ]; then
-#  cat ${DATA}/trak.avnx.atcfunix.${PDY}${cyc} | \
-#      sed s:AVNX:GFSO:g \
-#    > ${COMOUT}/gfso.t${cyc}z.cyclone.trackatcfunix
-#
-#  cat ${DATA}/trak.avnx.atcfunix.${PDY}${cyc} | \
-#      sed s:AVNX:AVNO:g \
-#    > ${COMOUT}/avn.t${cyc}z.cyclone.trackatcfunix
-#fi
-
 ##############################################
 # Final processing
 ##############################################
@@ -175,11 +135,9 @@ if [ -e "$pgmout" ] ; then
   cat $pgmout
 fi
 
-
 msg="ENDED NORMALLY."
 postmsg "$jlogfile" "$msg"
 
-
 ##########################################
 # Remove the Temporary working directory
 ##########################################
diff --git a/jobs/JGFS_GEMPAK b/jobs/JGFS_GEMPAK
index 888b970a3f..d6434f72f1 100755
--- a/jobs/JGFS_GEMPAK
+++ b/jobs/JGFS_GEMPAK
@@ -56,12 +56,13 @@ export DBN_ALERT_TYPE=${DBN_ALERT_TYPE:-GFS_GEMPAK}
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export model=${model:-gfs}
+export COMPONENT=${COMPONENT:-atmos}
 
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak}
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/jobs/JGFS_GEMPAK_META b/jobs/JGFS_GEMPAK_META
index 45c6a0153d..06edd5ebf3 100755
--- a/jobs/JGFS_GEMPAK_META
+++ b/jobs/JGFS_GEMPAK_META
@@ -62,6 +62,7 @@ export fhinc=12
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export model=${model:-gfs}
+export COMPONENT=${COMPONENT:-atmos}
 
 ##############################################
 # Set up model and cycle specific variables
@@ -71,8 +72,8 @@ export DBN_ALERT_TYPE=GFS_METAFILE
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/gempak/meta}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT/gempak}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak/meta}
 export COMINgempak=${COMINgempak:-${COMROOT}/${NET}/${envir}}
 
 export COMINukmet=${COMINukmet:-$(compath.py nawips/prod/ukmet)}
diff --git a/jobs/JGFS_GEMPAK_NCDC_UPAPGIF b/jobs/JGFS_GEMPAK_NCDC_UPAPGIF
index bf09cbf578..b9a6d411fc 100755
--- a/jobs/JGFS_GEMPAK_NCDC_UPAPGIF
+++ b/jobs/JGFS_GEMPAK_NCDC_UPAPGIF
@@ -65,13 +65,14 @@ export fstart=00
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export model=${model:-gfs}
+export COMPONENT=${COMPONENT:-atmos}
 
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/gempak}
-export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT/gempak}
+export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT}
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_PGRB2_SPEC_GEMPAK b/jobs/JGFS_PGRB2_SPEC_GEMPAK
index 0ad0ff0d4d..e913a9eca1 100755
--- a/jobs/JGFS_PGRB2_SPEC_GEMPAK
+++ b/jobs/JGFS_PGRB2_SPEC_GEMPAK
@@ -45,6 +45,7 @@ export SRCgfs=${SRCgfs:-$HOMEgfs/scripts}
 ####################################
 export NET=gfs
 export RUN=gfs_goessim
+export COMPONENT=${COMPONENT:-atmos}
 export finc=3
 export model=gfs
 export EXT=""
@@ -52,8 +53,8 @@ export EXT=""
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${NET}.${PDY}/${cyc}/gempak}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${NET}.${PDY}/${cyc}/$COMPONENT/gempak}
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/jobs/JGFS_PGRB2_SPEC_NPOESS b/jobs/JGFS_PGRB2_SPEC_NPOESS
index af9478237c..954ab52613 100755
--- a/jobs/JGFS_PGRB2_SPEC_NPOESS
+++ b/jobs/JGFS_PGRB2_SPEC_NPOESS
@@ -47,12 +47,13 @@ export FIXgfs=${FIXgfs:-$HOMEgfs/fix}
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export model=${model:-gfs}
+export COMPONENT=${COMPONENT:-atmos}
 
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT}
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_POSTSND b/jobs/JGFS_POSTSND
index 0777eff655..4205a27cfa 100755
--- a/jobs/JGFS_POSTSND
+++ b/jobs/JGFS_POSTSND
@@ -34,6 +34,7 @@ export cycle=t${cyc}z
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export model=${model:-gfs}
+export COMPONENT=${COMPONENT:-atmos}
 
 ###################################
 # Set up the UTILITIES
@@ -53,8 +54,8 @@ setpdy.sh
 ##############################
 # Define COM Directories
 ##############################
-export COMIN=${COMIN:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}}
-export COMOUT=${COMOUT:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}}
+export COMIN=${COMIN:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT}
 export pcom=${pcom:-${COMOUT}/wmo}
 export COMAWP=${COMAWP:-${COMOUT}/gempak}
 mkdir -p $COMOUT $pcom $COMAWP
diff --git a/jobs/JGLOBAL_EMCSFC_SFC_PREP b/jobs/JGLOBAL_EMCSFC_SFC_PREP
index c4c713a2f5..b40ee3b8f3 100755
--- a/jobs/JGLOBAL_EMCSFC_SFC_PREP
+++ b/jobs/JGLOBAL_EMCSFC_SFC_PREP
@@ -40,12 +40,11 @@ PDY_m6hrs=$(echo $GDATE | cut -c1-8)
 cyc_m6hrs=$(echo $GDATE | cut -c9-10)
 export cycle_m6hrs=t${cyc_m6hrs}z
 
-#### Lin Gan request for change
-#### export COMOUT=${COMROOT}/$NET/$envir/$RUN.$PDY/$cyc
-export COMOUT=${COMOUT:-${COMROOT}/$NET/$envir/$RUN.$PDY/$cyc}
+export COMPONENT=${COMPONENT:-atmos}
+export COMOUT=${COMOUT:-${COMROOT}/$NET/$envir/$RUN.$PDY/$cyc/$COMPONENT}
 
-export COMINgfs=${COMINgfs:-$(compath.py $NET/$envir/$RUN.$PDY)/$cyc}
-export COMINgfs_m6hrs=${COMINgfs_m6hrs:-$(compath.py $NET/$envir/$RUN.$PDY_m6hrs)/$cyc_m6hrs} 
+export COMINgfs=${COMINgfs:-$(compath.py $NET/$envir/$RUN.$PDY)/$cyc/$COMPONENT}
+export COMINgfs_m6hrs=${COMINgfs_m6hrs:-$(compath.py $NET/$envir/$RUN.$PDY_m6hrs)/$cyc_m6hrs/$COMPONENT} 
 
 export IMS_FILE=${COMINgfs}/${RUN}.${cycle}.imssnow96.grib2
 export FIVE_MIN_ICE_FILE=${COMINgfs}/${RUN}.${cycle}.seaice.5min.grib2
diff --git a/jobs/JGLOBAL_FORECAST b/jobs/JGLOBAL_FORECAST
index 6e8cb9f627..6f53551275 100755
--- a/jobs/JGLOBAL_FORECAST
+++ b/jobs/JGLOBAL_FORECAST
@@ -70,6 +70,14 @@ if [ $RUN_ENVIR = "nco" ]; then
     export RSTDIR=${GESROOT:?}/$envir
 fi
 
+# Set wave variables
+if [ ${DO_WAVE:-"NO"} = "YES" ]; then
+  # WAVE component directory
+  export CDUMPwave=${CDUMPwave:-${CDUMP}wave}
+  export COMINwave=${COMINwave:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
+  export COMOUTwave=${COMOUTwave:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
+fi
+
 ##############################################
 # Begin JOB SPECIFIC work
 ##############################################
diff --git a/jobs/JGLOBAL_TROPCY_QC_RELOC b/jobs/JGLOBAL_TROPCY_QC_RELOC
index 95fd4fb5ae..5e80606a4b 100755
--- a/jobs/JGLOBAL_TROPCY_QC_RELOC
+++ b/jobs/JGLOBAL_TROPCY_QC_RELOC
@@ -57,6 +57,7 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gfs"}}
+export COMPONENT=${COMPONENT:-atmos}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
@@ -88,8 +89,8 @@ export TANK_TROPCY=${TANK_TROPCY:-${DCOMROOT}/prod}   # path to tropical cyclone
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}
-export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}
+export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT
+export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT
 if [ ! -d ${COMOUT} ]; then mkdir -p $COMOUT; fi
 #export COMINgdas=${ROTDIR}/gdas.${PDY}/${cyc}
 #export COMINgfs=${ROTDIR}/gfs.${PDY}/${cyc}
diff --git a/jobs/JWAVE_INIT b/jobs/JGLOBAL_WAVE_INIT
similarity index 69%
rename from jobs/JWAVE_INIT
rename to jobs/JGLOBAL_WAVE_INIT
index 70cb2fd8b0..dbed424464 100755
--- a/jobs/JWAVE_INIT
+++ b/jobs/JGLOBAL_WAVE_INIT
@@ -27,16 +27,11 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
-
-export HOMEgfs=${HOMEgfs:-$NWROOT/${NET}.${gfs_ver}}
+export COMPONENT=${COMPONENT:-wave}
 
 # Add default errchk = err_chk
 export errchk=${errchk:-err_chk}
 
-# Set HOMEwave to HOMEgfs
-HOMEwave=${HOMEwave:-${HOMEgfs}} 
-
 # Create and go to DATA directory
 export DATA=${DATA:-${DATAROOT:?}/${jobid}}
 mkdir -p $DATA
@@ -53,24 +48,18 @@ export pgmout=OUTPUT.$$
 
 export MP_PULSE=0
 
-# Set resources to propagate NTASKS across cfp call
-NTASKS=${NTASKS:-${npe_node_waveinit}}
-export NTASKS=${NTASKS:?NTASKS required to be set}
-
 # Path to HOME Directory
-export FIXwave=${FIXwave:-$HOMEwave/fix/fix_wave_${NET}}
-export PARMwave=${PARMwave:-$HOMEwave/parm/wave}
-export USHwave=${USHwave:-$HOMEwave/ush}
+export FIXwave=${FIXwave:-$HOMEgfs/fix/fix_wave_${NET}}
+export PARMwave=${PARMwave:-$HOMEgfs/parm/wave}
+export USHwave=${USHwave:-$HOMEgfs/ush}
 export EXECwave=${EXECwave:-$HOMEgfs/exec}
 
 # Set COM Paths and GETGES environment
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
-export COMINwave=${COMINwave:-${ROTDIR:?}}
-export COMOUTwave=${COMOUTwave:-${ROTDIR:?}}
-export COMIN=${COMIN:-${COMINwave}/${COMPONENTwave}.${PDY}/${cyc}}
-export COMOUT=${COMOUT:-${COMOUTwave}/${COMPONENTwave}.${PDY}/${cyc}}
+export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
 [[ ! -d $COMOUT ]] && mkdir -m 775 -p $COMOUT
 
 if [ $SENDCOM = YES ]; then
@@ -82,7 +71,7 @@ export wavempexec=${launcher:-"mpirun -n"}
 export wave_mpmd=${mpmd:-"cfp"}
 
 # Execute the Script  
-$HOMEwave/scripts/exwave_init.sh
+$HOMEgfs/scripts/exgfs_wave_init.sh
 
 ##########################################
 # Remove the Temporary working directory
diff --git a/jobs/JWAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
similarity index 76%
rename from jobs/JWAVE_POST_SBS
rename to jobs/JGLOBAL_WAVE_POST_SBS
index bca6a0cb6a..87cf5e074e 100755
--- a/jobs/JWAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -27,7 +27,7 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
+export COMPONENT=${COMPONENT:-wave}
 
 export HOMEgefs=${HOMEgefs:-$NWROOT/$NET.${gefs_ver}}
 export HOMEgfs=${HOMEgfs:-$NWROOT/$NET.${gfs_ver}}
@@ -35,13 +35,6 @@ export HOMEgfs=${HOMEgfs:-$NWROOT/$NET.${gfs_ver}}
 # Add default errchk = err_chk
 export errchk=${errchk:-err_chk}
 
-# Set HOMEwave to HOMEgefs
-HOMEwave=${HOMEwave:-${HOMEgfs}} 
-
-# Set resources to propagate NTASKS across cfp call
-NTASKS=${NTASKS:-${npe_node_waveprep}}
-export NTASKS=${NTASKS:?NTASKS required to be set}
-
 # Create and go to DATA directory
 export DATA=${DATA:-${DATAROOT:?}/${jobid}}
 mkdir -p $DATA
@@ -59,19 +52,17 @@ export pgmout=OUTPUT.$$
 export MP_PULSE=0
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-$HOMEwave/fix/fix_wave_${NET}}
-export PARMwave=${PARMwave:-$HOMEwave/parm/wave}
-export USHwave=${USHwave:-$HOMEwave/ush}
+export FIXwave=${FIXwave:-$HOMEgfs/fix/fix_wave_${NET}}
+export PARMwave=${PARMwave:-$HOMEgfs/parm/wave}
+export USHwave=${USHwave:-$HOMEgfs/ush}
 export EXECwave=${EXECwave:-$HOMEgfs/exec}
 
 # Set COM Paths and GETGES environment
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
-export COMINwave=${COMINwave:-${ROTDIR:?}}
-export COMOUTwave=${COMOUTwave:-${ROTDIR:?}}
-export COMIN=${COMIN:-${COMINwave}/${COMPONENTwave}.${PDY}/${cyc}}
-export COMOUT=${COMOUT:-${COMOUTwave}/${COMPONENTwave}.${PDY}/${cyc}}
+export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
 
 export COMINice=${COMINice:-${COMROOTp2}/omb/prod}
 export COMINwnd=${COMINwnd:-${COMROOT}/gfs/prod}
@@ -94,12 +85,12 @@ env | sort
 membTAG='p'
 if [ "${waveMEMB}" == "00" ]; then membTAG='c'; fi
 export membTAG
-export WAV_MOD_TAG=${COMPONENTwave}${waveMEMB}
+export WAV_MOD_TAG=${CDUMP}wave${waveMEMB}
 
 export CFP_VERBOSE=1
 
 # Execute the Script  
-$HOMEwave/scripts/exwave_post_sbs.sh
+$HOMEgfs/scripts/exgfs_wave_post_sbs.sh
 err=$?
 if [ $err -ne 0 ]; then
   msg="FATAL ERROR: ex-script of GWES_POST failed!"
diff --git a/jobs/JWAVE_PREP b/jobs/JGLOBAL_WAVE_PREP
similarity index 71%
rename from jobs/JWAVE_PREP
rename to jobs/JGLOBAL_WAVE_PREP
index ba821d2ee2..59e2932ca9 100755
--- a/jobs/JWAVE_PREP
+++ b/jobs/JGLOBAL_WAVE_PREP
@@ -27,20 +27,13 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
+export COMPONENT=${COMPONENT:-wave}
 
 export HOMEgfs=${HOMEgfs:-$NWROOT/gfs.${gfs_ver}}
 
 # Add default errchk = err_chk
 export errchk=${errchk:-err_chk}
 
-# Set HOMEwave to HOMEgfs
-HOMEwave=${HOMEwave:-${HOMEgfs}} 
-
-# Set resources to propagate NTASKS across cfp call
-NTASKS=${NTASKS:-${npe_node_waveprep}}
-export NTASKS=${NTASKS:?NTASKS required to be set}
-
 # Create and go to DATA directory
 export DATA=${DATA:-${DATAROOT:?}/${jobid}}
 mkdir -p $DATA
@@ -63,24 +56,22 @@ export MP_PULSE=0
 export CDO=${CDO_ROOT}/bin/cdo
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-$HOMEwave/fix/fix_wave_${NET}}
-export PARMwave=${PARMwave:-$HOMEwave/parm/wave}
-export USHwave=${USHwave:-$HOMEwave/ush}
+export FIXwave=${FIXwave:-$HOMEgfs/fix/fix_wave_${NET}}
+export PARMwave=${PARMwave:-$HOMEgfs/parm/wave}
+export USHwave=${USHwave:-$HOMEgfs/ush}
 export EXECwave=${EXECwave:-$HOMEgfs/exec}
 
 # Set COM Paths and GETGES environment
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
-export COMINwave=${COMINwave:-${ROTDIR:?}}
-export COMOUTwave=${COMOUTwave:-${ROTDIR:?}}
-export COMIN=${COMIN:-${COMINwave}/${COMPONENTwave}.${PDY}/${cyc}}
-export COMOUT=${COMOUT:-${COMOUTwave}/${COMPONENTwave}.${PDY}/${cyc}}
+export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
 [[ ! -d $COMOUT ]] && mkdir -m 775 -p $COMOUT
 
 if [ $RUN_ENVIR = "nco" ]; then
-  export COMIN_WAV_ICE=${COMIN_WAV_ICE:-$(compath.py gfs/prod)}/${CDUMP}.${PDY}/${cyc}
-  export COMIN_WAV_WND=${COMIN_WAV_WND:-$(compath.py gfs/prod)}/${CDUMP}.${PDY}/${cyc}
+  export COMIN_WAV_ICE=${COMIN_WAV_ICE:-$(compath.py gfs/prod)}/${CDUMP}.${PDY}/${cyc}/atmos
+  export COMIN_WAV_WND=${COMIN_WAV_WND:-$(compath.py gfs/prod)}/${CDUMP}.${PDY}/${cyc}/atmos
   export COMIN_WAV_CUR=${COMIN_WAV_CUR:-$(compath.py ${WAVECUR_DID}/prod)}/${WAVECUR_DID}.${RPDY}
   if [ ! -d $COMIN_WAV_CUR ]; then
     export RPDY=`$NDATE -24 ${PDY}00 | cut -c1-8`
@@ -91,10 +82,10 @@ else
   if [ ! -L $ROTDIR/${WAVECUR_DID}.${RPDY} ]; then # Check if symlink already exists in ROTDIR
     $NLN $DMPDIR/${WAVECUR_DID}.${RPDY} $ROTDIR/${WAVECUR_DID}.${RPDY}
   fi
-  if [ ! -L $ROTDIR/${CDUMP}.${PDY}/${cyc}/${WAVICEFILE} ]; then # Check if symlink already exists in ROTDIR
-    $NLN $DMPDIR/$CDUMP.${PDY}/$cyc/${WAVICEFILE} $ROTDIR/$CDUMP.${PDY}/$cyc/${WAVICEFILE}
+  if [ ! -L $ROTDIR/${CDUMP}.${PDY}/${cyc}/atmos/${WAVICEFILE} ]; then # Check if symlink already exists in ROTDIR
+    $NLN $DMPDIR/$CDUMP.${PDY}/$cyc/${WAVICEFILE} $ROTDIR/$CDUMP.${PDY}/$cyc/atmos/${WAVICEFILE}
   fi
-  export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc}
+  export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/atmos}
   export COMIN_WAV_ICE=${COMIN_OBS}
   export COMIN_WAV_WND=${COMIN_OBS}
   export COMIN_WAV_CUR=${ROTDIR}/${WAVECUR_DID}.${RPDY}
@@ -104,12 +95,8 @@ fi
 export wavempexec=${launcher:-"mpirun -n"}
 export wave_mpmd=${mpmd:-"cfp"}
 
-# Set wave model ID tag to include member number 
-# if ensemble; waveMEMB var empty in deterministic
-export WAV_MOD_TAG=${COMPONENTwave}${waveMEMB}
-
 # Execute the Script  
-$HOMEwave/scripts/exwave_prep.sh
+$HOMEgfs/scripts/exgfs_wave_prep.sh
 
 ##########################################
 # Remove the Temporary working directory
diff --git a/jobs/rocoto/arch.sh b/jobs/rocoto/arch.sh
index 68286fee57..bdfa41a25e 100755
--- a/jobs/rocoto/arch.sh
+++ b/jobs/rocoto/arch.sh
@@ -44,6 +44,7 @@ else
    format="nemsio"
 fi
 
+
 # Realtime parallels run GFS MOS on 1 day delay
 # If realtime parallel, back up CDATE_MOS one day
 CDATE_MOS=$CDATE
@@ -56,7 +57,7 @@ PDY_MOS=$(echo $CDATE_MOS | cut -c1-8)
 # Archive online for verification and diagnostics
 ###############################################################
 
-COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
+COMIN=${COMINatmos:-"$ROTDIR/$CDUMP.$PDY/$cyc/atmos"}
 cd $COMIN
 
 [[ ! -d $ARCDIR ]] && mkdir -p $ARCDIR
@@ -303,8 +304,8 @@ RTOFS_DATE=$($NDATE -48 $CDATE)
 while [ $GDATE -le $GDATEEND ]; do
     gPDY=$(echo $GDATE | cut -c1-8)
     gcyc=$(echo $GDATE | cut -c9-10)
-    COMIN="$ROTDIR/$CDUMP.$gPDY/$gcyc"
-    COMINwave="$ROTDIR/${CDUMP}wave.$gPDY/$gcyc"
+    COMIN="$ROTDIR/${CDUMP}.$gPDY/$gcyc/atmos"
+    COMINwave="$ROTDIR/${CDUMP}.$gPDY/$gcyc/wave"
     COMINrtofs="$ROTDIR/rtofs.$gPDY"
     if [ -d $COMIN ]; then
         rocotolog="$EXPDIR/logs/${GDATE}.log"
@@ -329,12 +330,10 @@ while [ $GDATE -le $GDATEEND ]; do
     fi
 
     # Remove any empty directories
-    COMIN="$ROTDIR/$CDUMP.$gPDY"
     if [ -d $COMIN ]; then
         [[ ! "$(ls -A $COMIN)" ]] && rm -rf $COMIN
     fi
 
-    COMINwave="$ROTDIR/${CDUMP}wave.$gPDY"
     if [ -d $COMINwave ]; then
         [[ ! "$(ls -A $COMINwave)" ]] && rm -rf $COMINwave
     fi
diff --git a/jobs/rocoto/awips.sh b/jobs/rocoto/awips.sh
index 4c04f75f19..40c5db8cb4 100755
--- a/jobs/rocoto/awips.sh
+++ b/jobs/rocoto/awips.sh
@@ -40,10 +40,11 @@ status=$?
 [[ $status -ne 0 ]] && exit $status
 
 ###############################################################
+export COMPONENT=${COMPONENT:-atmos}
 export CDATEm1=$($NDATE -24 $CDATE)
 export PDYm1=$(echo $CDATEm1 | cut -c1-8)
 
-export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
 export DATAROOT="$RUNDIR/$CDATE/$CDUMP/awips$FHRGRP"
 [[ -d $DATAROOT ]] && rm -rf $DATAROOT
 mkdir -p $DATAROOT
@@ -53,7 +54,7 @@ mkdir -p $DATAROOT
 echo
 echo "=============== BEGIN AWIPS ==============="
 export SENDCOM="YES"
-export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
 export PCOM="$COMOUT/wmo"
 export jlogfile="$ROTDIR/logs/$CDATE/jgfs_awips.log"
 
diff --git a/jobs/rocoto/earc.sh b/jobs/rocoto/earc.sh
index 3bc42fab68..795b567b72 100755
--- a/jobs/rocoto/earc.sh
+++ b/jobs/rocoto/earc.sh
@@ -28,6 +28,8 @@ for config in $configs; do
     [[ $status -ne 0 ]] && exit $status
 done
 
+export COMPONENT=${COMPONENT:-atmos}
+
 n=$((ENSGRP))
 
 # ICS are restarts and always lag INC by $assim_freq hours.
@@ -40,7 +42,7 @@ fi
 # EnKF update in GFS, GDAS or both
 CDUMP_ENKF=$(echo ${EUPD_CYC:-"gdas"} | tr a-z A-Z)
 
-ARCH_LIST="$ROTDIR/enkf${CDUMP}.$PDY/$cyc/earc$ENSGRP"
+ARCH_LIST="$ROTDIR/enkf${CDUMP}.$PDY/$cyc/$COMPONENT/earc$ENSGRP"
 [[ -d $ARCH_LIST ]] && rm -rf $ARCH_LIST
 mkdir -p $ARCH_LIST
 cd $ARCH_LIST
@@ -130,12 +132,12 @@ if [ $ENSGRP -eq 0 ]; then
     [[ ! -d $ARCDIR ]] && mkdir -p $ARCDIR
     cd $ARCDIR
 
-    $NCP $ROTDIR/enkf${CDUMP}.$PDY/$cyc/${CDUMP}.t${cyc}z.enkfstat       enkfstat.${CDUMP}.$CDATE
-    $NCP $ROTDIR/enkf$CDUMP.$PDY/$cyc/${CDUMP}.t${cyc}z.gsistat.ensmean  gsistat.${CDUMP}.${CDATE}.ensmean
+    $NCP $ROTDIR/enkf${CDUMP}.$PDY/$cyc/$COMPONENT/${CDUMP}.t${cyc}z.enkfstat         enkfstat.${CDUMP}.$CDATE
+    $NCP $ROTDIR/enkf${CDUMP}.$PDY/$cyc/$COMPONENT/${CDUMP}.t${cyc}z.gsistat.ensmean  gsistat.${CDUMP}.${CDATE}.ensmean
 
     if [ $CDUMP_ENKF != "GDAS" ]; then
-		$NCP $ROTDIR/enkfgfs.$PDY/$cyc/${CDUMP}.t${cyc}z.enkfstat         enkfstat.gfs.$CDATE
-		$NCP $ROTDIR/enkfgfs.$PDY/$cyc/${CDUMP}.t${cyc}z.gsistat.ensmean  gsistat.gfs.${CDATE}.ensmean
+		$NCP $ROTDIR/enkfgfs.$PDY/$cyc/$COMPONENT/${CDUMP}.t${cyc}z.enkfstat         enkfstat.gfs.$CDATE
+		$NCP $ROTDIR/enkfgfs.$PDY/$cyc/$COMPONENT/${CDUMP}.t${cyc}z.gsistat.ensmean  gsistat.gfs.${CDATE}.ensmean
 	fi
 
 fi
@@ -159,10 +161,10 @@ if [ $ENSGRP -eq 0 ]; then
     gPDY=$(echo $GDATE | cut -c1-8)
     gcyc=$(echo $GDATE | cut -c9-10)
 
-	# Handle GDAS and GFS EnKF directories separately
-    COMIN_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc"
+    # Handle GDAS and GFS EnKF directories separately
+    COMIN_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/$COMPONENT"
     [[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS
-    COMIN_ENS="$ROTDIR/enkfgfs.$gPDY/$gcyc"
+    COMIN_ENS="$ROTDIR/enkfgfs.$gPDY/$gcyc/$COMPONENT"
     [[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS
 
     # PREVIOUS day 00Z remove the whole day
@@ -170,7 +172,7 @@ if [ $ENSGRP -eq 0 ]; then
     gPDY=$(echo $GDATE | cut -c1-8)
     gcyc=$(echo $GDATE | cut -c9-10)
 
-	# Handle GDAS and GFS EnKF directories separately
+    # Handle GDAS and GFS EnKF directories separately
     COMIN_ENS="$ROTDIR/enkfgdas.$gPDY"
     [[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS
     COMIN_ENS="$ROTDIR/enkfgfs.$gPDY"
diff --git a/jobs/rocoto/fv3ic.sh b/jobs/rocoto/fv3ic.sh
index 72dca464ed..b5c2e40b48 100755
--- a/jobs/rocoto/fv3ic.sh
+++ b/jobs/rocoto/fv3ic.sh
@@ -33,6 +33,9 @@ done
 status=$?
 [[ $status -ne 0 ]] && exit $status
 
+# Set component
+export COMPONENT=${COMPONENT:-atmos}
+
 # Temporary runtime directory
 export DATA="$RUNDIR/$CDATE/$CDUMP/fv3ic$$"
 [[ -d $DATA ]] && rm -rf $DATA
@@ -55,7 +58,7 @@ if [ $status -ne 0 ]; then
 fi
 
 # Stage the FV3 initial conditions to ROTDIR
-COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
+COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
 [[ ! -d $COMOUT ]] && mkdir -p $COMOUT
 cd $COMOUT || exit 99
 rm -rf INPUT
diff --git a/jobs/rocoto/gempak.sh b/jobs/rocoto/gempak.sh
index d31f11dac7..599c6f3766 100755
--- a/jobs/rocoto/gempak.sh
+++ b/jobs/rocoto/gempak.sh
@@ -39,10 +39,11 @@ status=$?
 [[ $status -ne 0 ]] && exit $status
 
 ###############################################################
+export COMPONENT=${COMPONENT:-atmos}
 export CDATEm1=$($NDATE -24 $CDATE)
 export PDYm1=$(echo $CDATEm1 | cut -c1-8)
 
-export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
 export DATAROOT="$RUNDIR/$CDATE/$CDUMP/gempak"
 [[ -d $DATAROOT ]] && rm -rf $DATAROOT
 mkdir -p $DATAROOT
@@ -55,7 +56,7 @@ export job="jgfs_gempak_${cyc}"
 export jlogfile="$ROTDIR/logs/$CDATE/$job.log"    
 export DATA="${DATAROOT}/$job"
 export SENDCOM="YES"
-export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/gempak"
+export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT/gempak"
 export FIXgfs=""  # set blank so that GEMPAKSH defaults FIXgfs to HOMEgfs/gempak/fix
 export USHgfs=""  # set blank so that GEMPAKSH defaults FIXgfs to HOMEgfs/gempak/ush
 
diff --git a/jobs/rocoto/getic.sh b/jobs/rocoto/getic.sh
index 2da15881cd..fc938a1531 100755
--- a/jobs/rocoto/getic.sh
+++ b/jobs/rocoto/getic.sh
@@ -41,6 +41,8 @@ mm=$(echo $CDATE | cut -c5-6)
 dd=$(echo $CDATE | cut -c7-8)
 cyc=${cyc:-$(echo $CDATE | cut -c9-10)}
 
+export COMPONENT=${COMPONENT:-atmos}
+
 ###############################################################
 
 target_dir=$ICSDIR/$CDATE/$CDUMP
@@ -187,7 +189,7 @@ fi
 
 # Copy pgbanl file to COMROT for verification - GFSv14 only
 if [ $CDATE -le "2019061118" ]; then #GFSv14
-  COMROT=$ROTDIR/${CDUMP}.$PDY/$cyc
+  COMROT=$ROTDIR/${CDUMP}.$PDY/$cyc/$COMPONENT
   [[ ! -d $COMROT ]] && mkdir -p $COMROT
   $NCP ${fanal[4]} $COMROT/${CDUMP}.t${cyc}z.pgrbanl
 fi
diff --git a/jobs/rocoto/metp.sh b/jobs/rocoto/metp.sh
index b6658a5239..789810d6a7 100755
--- a/jobs/rocoto/metp.sh
+++ b/jobs/rocoto/metp.sh
@@ -40,10 +40,11 @@ status=$?
 [[ $status -ne 0 ]] && exit $status
 
 ###############################################################
+export COMPONENT=${COMPONENT:-atmos}
 export CDATEm1=$($NDATE -24 $CDATE)
 export PDYm1=$(echo $CDATEm1 | cut -c1-8)
 
-export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
 export DATAROOT="$RUNDIR/$CDATE/$CDUMP/vrfy"
 [[ -d $DATAROOT ]] && rm -rf $DATAROOT
 mkdir -p $DATAROOT
diff --git a/jobs/rocoto/post.sh b/jobs/rocoto/post.sh
index 70476cdc8e..4a253db31e 100755
--- a/jobs/rocoto/post.sh
+++ b/jobs/rocoto/post.sh
@@ -11,13 +11,14 @@
 status=$?
 [[ $status -ne 0 ]] && exit $status
 
+export COMPONENT=${COMPONENT:-atmos}
 
 if [ $FHRGRP -eq 0 ]; then
     fhrlst="anl"
-    restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/${CDUMP}.t${cyc}z.atm
+    restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/$COMPONENT/${CDUMP}.t${cyc}z.atm
 else
     fhrlst=$(echo $FHRLST | sed -e 's/_/ /g; s/f/ /g; s/,/ /g')
-    restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/${CDUMP}.t${cyc}z.logf
+    restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/$COMPONENT/${CDUMP}.t${cyc}z.logf
 fi
 
 
@@ -33,8 +34,8 @@ for fhr in $fhrlst; do
         continue
     fi
 
-    #master=$ROTDIR/${CDUMP}.${PDY}/${cyc}/${CDUMP}.t${cyc}z.master.grb2f${fhr}
-    pgb0p25=$ROTDIR/${CDUMP}.${PDY}/${cyc}/${CDUMP}.t${cyc}z.pgrb2.0p25.f${fhr}
+    #master=$ROTDIR/${CDUMP}.${PDY}/${cyc}/$COMPONENT/${CDUMP}.t${cyc}z.master.grb2f${fhr}
+    pgb0p25=$ROTDIR/${CDUMP}.${PDY}/${cyc}/$COMPONENT/${CDUMP}.t${cyc}z.pgrb2.0p25.f${fhr}
     if [ ! -s $pgb0p25 ]; then
         export post_times=$fhr
         $HOMEgfs/jobs/JGLOBAL_NCEPPOST
diff --git a/jobs/rocoto/postsnd.sh b/jobs/rocoto/postsnd.sh
index 8a30d329b5..e3a7e3f8d7 100755
--- a/jobs/rocoto/postsnd.sh
+++ b/jobs/rocoto/postsnd.sh
@@ -39,10 +39,11 @@ status=$?
 [[ $status -ne 0 ]] && exit $status
 
 ###############################################################
+export COMPONENT=${COMPONENT:-atmos}
 export CDATEm1=$($NDATE -24 $CDATE)
 export PDYm1=$(echo $CDATEm1 | cut -c1-8)
 
-export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
 export DATAROOT="$RUNDIR/$CDATE/$CDUMP/postsnd"
 [[ -d $DATAROOT ]] && rm -rf $DATAROOT
 mkdir -p $DATAROOT
@@ -57,7 +58,7 @@ export DATA="${DATAROOT}/$job"
 export SENDCOM="YES"
 export SENDDBN="YES"
 export HOMEbufrsnd=$HOMEgfs
-export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
 export pcom="$COMOUT/wmo"
 export COMAWP="$COMOUT/gempak"
 
diff --git a/jobs/rocoto/prep.sh b/jobs/rocoto/prep.sh
index 8e8037ebd6..39ec1c0a7a 100755
--- a/jobs/rocoto/prep.sh
+++ b/jobs/rocoto/prep.sh
@@ -23,8 +23,9 @@ status=$?
 
 ###############################################################
 # Set script and dependency variables
+export COMPONENT=${COMPONENT:-atmos}
 export OPREFIX="${CDUMP}.t${cyc}z."
-export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
 [[ ! -d $COMOUT ]] && mkdir -p $COMOUT
 
 ###############################################################
@@ -39,7 +40,7 @@ if [ $ROTDIR_DUMP = "YES" ]; then
    gPDY=$(echo $GDATE | cut -c1-8)
    gcyc=$(echo $GDATE | cut -c9-10)
    GDUMP=gdas
-   gCOMOUT="$ROTDIR/$GDUMP.$gPDY/$gcyc"
+   gCOMOUT="$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
    if [ ! -s $gCOMOUT/$GDUMP.t${gcyc}z.updated.status.tm00.bufr_d ]; then
      $HOMEgfs/ush/getdump.sh $GDATE $GDUMP $DMPDIR/${GDUMP}${DUMP_SUFFIX}.${gPDY}/${gcyc} $gCOMOUT
      status=$?
@@ -90,13 +91,16 @@ if [ $DO_MAKEPREPBUFR = "YES" ]; then
 
     export job="j${CDUMP}_prep_${cyc}"
     export DATAROOT="$RUNDIR/$CDATE/$CDUMP/prepbufr"
+    #export COMIN=${COMIN:-$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT}
+    export COMIN=${COMIN:-$ROTDIR}
+    export COMINgdas=${COMINgdas:-$ROTDIR/gdas.$PDY/$cyc/$COMPONENT}
+    export COMINgfs=${COMINgfs:-$ROTDIR/gfs.$PDY/$cyc/$COMPONENT}
     if [ $ROTDIR_DUMP = "NO" ]; then
       COMIN_OBS=${COMIN_OBS:-$DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}}
       export COMSP=${COMSP:-$COMIN_OBS/$CDUMP.t${cyc}z.}
+    else
+      export COMSP=${COMSP:-$ROTDIR/${CDUMP}.${PDY}/${cyc}/$COMPONENT/$CDUMP.t${cyc}z.}
     fi
-    export COMIN=${COMIN:-$ROTDIR/$CDUMP.$PDY/$cyc}
-    export COMINgdas=${COMINgdas:-$ROTDIR/gdas.$PDY/$cyc}
-    export COMINgfs=${COMINgfs:-$ROTDIR/gfs.$PDY/$cyc}
 
     $HOMEobsproc_network/jobs/JGLOBAL_PREP
     status=$?
diff --git a/jobs/rocoto/vrfy.sh b/jobs/rocoto/vrfy.sh
index 0c077c8152..f3101fc95a 100755
--- a/jobs/rocoto/vrfy.sh
+++ b/jobs/rocoto/vrfy.sh
@@ -39,10 +39,11 @@ status=$?
 [[ $status -ne 0 ]] && exit $status
 
 ###############################################################
+export COMPONENT=${COMPONENT:-atmos}
 export CDATEm1=$($NDATE -24 $CDATE)
 export PDYm1=$(echo $CDATEm1 | cut -c1-8)
 
-export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
 export DATAROOT="$RUNDIR/$CDATE/$CDUMP/vrfy"
 [[ -d $DATAROOT ]] && rm -rf $DATAROOT
 mkdir -p $DATAROOT
@@ -55,7 +56,7 @@ if [ $MKPGB4PRCP = "YES" -a $CDUMP = "gfs" ]; then
     nthreads_env=${OMP_NUM_THREADS:-1} # get threads set in env
     export OMP_NUM_THREADS=1
     cd $COMIN
-    fhmax=$vhr_rain
+    fhmax=${vhr_rain:-$FHMAX_GFS}
     fhr=0
     while [ $fhr -le $fhmax ]; do
        fhr2=$(printf %02i $fhr)
@@ -122,7 +123,7 @@ echo "=============== START TO RUN RADMON DATA EXTRACTION ==============="
 if [ $VRFYRAD = "YES" -a $CDUMP = $CDFNL -a $CDATE != $SDATE ]; then
 
     export EXP=$PSLOT
-    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
+    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
     export jlogfile="$ROTDIR/logs/$CDATE/${CDUMP}radmon.log"
     export TANKverf_rad="$TANKverf/stats/$PSLOT/$CDUMP.$PDY"
     export TANKverf_radM1="$TANKverf/stats/$PSLOT/$CDUMP.$PDYm1"
@@ -139,7 +140,7 @@ echo "=============== START TO RUN OZMON DATA EXTRACTION ==============="
 if [ $VRFYOZN = "YES" -a $CDUMP = $CDFNL -a $CDATE != $SDATE ]; then
 
     export EXP=$PSLOT
-    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
+    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
     export jlogfile="$ROTDIR/logs/$CDATE/${CDUMP}oznmon.log"
     export TANKverf_ozn="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDY"
     export TANKverf_oznM1="$TANKverf_ozn/stats/$PSLOT/$CDUMP.$PDYm1"
@@ -155,7 +156,7 @@ echo
 echo "=============== START TO RUN MINMON ==============="
 if [ $VRFYMINMON = "YES" -a $CDATE != $SDATE ]; then
 
-    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
+    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
     export jlogfile="$ROTDIR/logs/$CDATE/${CDUMP}minmon.log"
     export M_TANKverfM0="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDY"
     export M_TANKverfM1="$M_TANKverf/stats/$PSLOT/$CDUMP.$PDYm1"
diff --git a/jobs/rocoto/waveinit.sh b/jobs/rocoto/waveinit.sh
index ce7397c3e7..5f837bcee0 100755
--- a/jobs/rocoto/waveinit.sh
+++ b/jobs/rocoto/waveinit.sh
@@ -11,7 +11,7 @@ status=$?
 echo
 echo "=============== START TO RUN WAVE INIT ==============="
 # Execute the JJOB
-$HOMEgfs/jobs/JWAVE_INIT
+$HOMEgfs/jobs/JGLOBAL_WAVE_INIT
 status=$?
 exit $status
 
diff --git a/jobs/rocoto/wavepostsbs.sh b/jobs/rocoto/wavepostsbs.sh
index 751bb9e8c4..3139ba477f 100755
--- a/jobs/rocoto/wavepostsbs.sh
+++ b/jobs/rocoto/wavepostsbs.sh
@@ -11,7 +11,7 @@ status=$?
 echo
 echo "=============== START TO RUN WAVE POST_SBS ==============="
 # Execute the JJOB
-$HOMEgfs/jobs/JWAVE_POST_SBS
+$HOMEgfs/jobs/JGLOBAL_WAVE_POST_SBS
 status=$?
 exit $status
 
diff --git a/jobs/rocoto/waveprep.sh b/jobs/rocoto/waveprep.sh
index faef5533d9..f93e02fed0 100755
--- a/jobs/rocoto/waveprep.sh
+++ b/jobs/rocoto/waveprep.sh
@@ -11,7 +11,7 @@ status=$?
 echo
 echo "=============== START TO RUN WAVE PREP ==============="
 # Execute the JJOB
-$HOMEgfs/jobs/JWAVE_PREP
+$HOMEgfs/jobs/JGLOBAL_WAVE_PREP
 status=$?
 exit $status
 
diff --git a/modulefiles/module_base.wcoss_dell_p3 b/modulefiles/module_base.wcoss_dell_p3
index 3cae0bd30b..76de5f0622 100644
--- a/modulefiles/module_base.wcoss_dell_p3
+++ b/modulefiles/module_base.wcoss_dell_p3
@@ -7,7 +7,7 @@
 module load ips/18.0.1.163
 module load impi/18.0.1    
 module load lsf/10.1       
-module load EnvVars/1.0.2
+module load EnvVars/1.0.3
 
 module load HPSS/5.0.2.5
 module load prod_util/1.1.4
@@ -16,7 +16,7 @@ module unload grib_util/1.0.6
 module load grib_util/1.1.0
 
 module load NCO/4.7.0   
-module load CFP/2.0.1
+module load CFP/2.0.2
 setenv USE_CFP YES
 module load pm5
 
@@ -37,5 +37,5 @@ module load crtm/2.3.0
 module load g2tmpl/1.6.0
 
 # Load FSU Genesis module
-module use -a /gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/tracker/ens_tracker.v1.1.15.2/tclogg/modulefiles
+module use -a /gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/tracker/ens_tracker.v1.1.15.3/ush/FSUgenesisPY/modulefiles
 module load tclogg
diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn
index 66bab5904b..a185ed2ee9 100755
--- a/parm/config/config.base.emc.dyn
+++ b/parm/config/config.base.emc.dyn
@@ -43,7 +43,6 @@ export NOSCRUB="@NOSCRUB@"
 
 # Base directories for various builds
 export BASE_GIT="@BASE_GIT@"
-export BASE_SVN="@BASE_SVN@"
 
 # Toggle to turn on/off GFS downstream processing.
 export DO_BUFRSND="YES"
@@ -71,7 +70,7 @@ export HOMEpost="$HOMEgfs"
 export HOMEobsproc_prep="$BASE_GIT/obsproc/gfsv16b/obsproc_prep.iss70457.netcdfhistory"
 export HOMEobsproc_network="$BASE_GIT/obsproc/gfsv16b/obsproc_global.iss71402.supportGFSv16"
 export HOMEobsproc_global=$HOMEobsproc_network
-export BASE_VERIF="$BASE_SVN/verif/global/tags/vsdb"
+export BASE_VERIF="$BASE_GIT/verif/global/tags/vsdb"
 
 # CONVENIENT utility scripts and other environment parameters
 export NCP="/bin/cp -p"
@@ -110,6 +109,11 @@ export ATARDIR="/NCEPDEV/$HPSS_PROJECT/1year/$USER/$machine/scratch/$PSLOT"
 export envir=${envir:-"prod"}
 export NET="gfs"
 export RUN=${RUN:-${CDUMP:-"gfs"}}
+export COMINatmos=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos
+export COMOUTatmos=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos
+export COMINwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave
+export COMOUTwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave
+
 export jlogfile="${EXPDIR}/logs/jlogfile"
 export ERRSCRIPT=${ERRSCRIPT:-'eval [[ $err = 0 ]]'}
 export LOGSCRIPT=${LOGSCRIPT:-""}
diff --git a/parm/config/config.base.nco.static b/parm/config/config.base.nco.static
index 183bd9d0b5..b014c7373b 100755
--- a/parm/config/config.base.nco.static
+++ b/parm/config/config.base.nco.static
@@ -50,7 +50,6 @@ export RTMFIX=$CRTM_FIX
 
     # Base directories for various builds
     export BASE_GIT="/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git"
-    export BASE_SVN="/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git"
 
 
 # Toggle to turn on/off GFS downstream processing.
@@ -75,7 +74,7 @@ export HOMEfv3gfs="$HOMEgfs/sorc/fv3gfs.fd"
 export HOMEpost="$HOMEgfs"
 export HOMEobsproc_prep="$BASE_GIT/obsproc/obsproc_prep.iss-46886.fv3gfs"
 export HOMEobsproc_network="$BASE_GIT/obsproc/obsproc_global.iss-46886.fv3gfs"
-export BASE_VERIF="$BASE_SVN/verif/global/tags/vsdb"
+export BASE_VERIF="$BASE_GIT/verif/global/tags/vsdb"
 
 # CONVENIENT utility scripts and other environment parameters
 export NCP="/bin/cp -p"
@@ -108,6 +107,11 @@ export ATARDIR="/NCEPDEV/$HPSS_PROJECT/1year/$USER/$machine/scratch/$PSLOT"
 export envir=${envir:-"prod"}
 export NET="gfs"
 export RUN=${RUN:-${CDUMP:-"gfs"}}
+export COMINatmos=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos
+export COMOUTatmos=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos
+export COMINwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave
+export COMOUTwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave
+
 export ERRSCRIPT=${ERRSCRIPT:-'eval [[ $err = 0 ]]'}
 export LOGSCRIPT=${LOGSCRIPT:-""}
 #export ERRSCRIPT=${ERRSCRIPT:-"err_chk"}
diff --git a/parm/config/config.vrfy b/parm/config/config.vrfy
index 6cfdd5d1d8..af1df37dfb 100755
--- a/parm/config/config.vrfy
+++ b/parm/config/config.vrfy
@@ -44,10 +44,10 @@ if [ $VRFYFITS = "YES" ]; then
     fi
 
     if [ $machine = "WCOSS_C" ]; then
-        export fitdir="$BASE_SVN/verif/global/parafits.fv3nems/batrun"
+        export fitdir="$BASE_GIT/verif/global/parafits.fv3nems/batrun"
         export PREPQFITSH="$fitdir/subfits_cray_nems"
     elif [ $machine = "WCOSS_DELL_P3" ]; then
-        export fitdir="$BASE_SVN/verif/global/Fit2Obs/ncf-vqc/batrun"
+        export fitdir="$BASE_GIT/verif/global/Fit2Obs/ncf-vqc/batrun"
         export PREPQFITSH="$fitdir/subfits_dell_nems"
     elif [ $machine = "HERA" ]; then
         #export fitdir="$BASE_GIT/Fit2Obs/batrun"
diff --git a/parm/config/config.wave b/parm/config/config.wave
index e8d2e1edf9..df37ff49d3 100755
--- a/parm/config/config.wave
+++ b/parm/config/config.wave
@@ -14,13 +14,10 @@ export wave_sys_ver=v1.0.0
 # Some others are also used across the workflow in wave component scripts
 
 # General runtime labels
-# export WAV_MOD_ID=${WAV_MOD_ID:-wave} # generic modID=wave valid for GFSv16 and beyond
-# COMPONENTwave stands for model component, in addition to NET/RUN for coupled systems
-export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
+export CDUMPwave="${CDUMP}wave"
 
 # In GFS/GDAS, restart files are generated/read from gdas runs
-# Can I use rCDUMP here????
-export COMPONENTRSTwave=${COMPONENTRSTwave:-gdaswave}
+export CDUMPRSTwave="gdas"
 
 # Grids for wave model
 # GFSv16
@@ -74,7 +71,7 @@ if [ "$CDUMP" = "gdas" ]; then
   WAVNCYC=4
   WAVHCYC=6
   FHMAX_WAV_CUR=${FHMAX_WAV_CUR:-48} # RTOFS forecasts only out to 8 days
-elif [ ${gfs_cyc} -ne 0 ]; then 
+elif [ ${gfs_cyc} -ne 0 ]; then
   FHMAX_WAV_CUR=${FHMAX_WAV_CUR:-192} # RTOFS forecasts only out to 8 days
   WAVHCYC=`expr 24 / ${gfs_cyc}`
 else
diff --git a/scripts/exwave_init.sh b/scripts/exgfs_wave_init.sh
similarity index 95%
rename from scripts/exwave_init.sh
rename to scripts/exgfs_wave_init.sh
index 714ed7880b..0183c5bfa9 100755
--- a/scripts/exwave_init.sh
+++ b/scripts/exgfs_wave_init.sh
@@ -37,7 +37,7 @@
 
   msg="HAS BEGUN on `hostname`"
   postmsg "$jlogfile" "$msg"
-  msg="Starting MWW3 INIT CONFIG SCRIPT for $COMPONENTwave"
+  msg="Starting MWW3 INIT CONFIG SCRIPT for ${CDUMP}wave"
   postmsg "$jlogfile" "$msg"
 
   set +x
@@ -46,7 +46,7 @@
   echo '                      *** MWW3 INIT CONFIG  SCRIPT ***'
   echo '                      ********************************'
   echo '                          Initial configuration script'
-  echo "                          Model identifier : $COMPONENTwave"
+  echo "                       Model identifier : ${CDUMP}wave"
   echo ' '
   echo "Starting at : `date`"
   echo ' '
@@ -90,12 +90,12 @@
 
   for grdID in ${grdALL}
   do
-    if [ -f "$COMIN/rundata/${COMPONENTwave}.mod_def.${grdID}" ]
+    if [ -f "$COMIN/rundata/${CDUMP}wave.mod_def.${grdID}" ]
     then
       set +x
       echo " Mod def file for $grdID found in ${COMIN}/rundata. copying ...."
       [[ "$LOUD" = YES ]] && set -x
-      cp $COMIN/rundata/${COMPONENTwave}.mod_def.${grdID} mod_def.$grdID
+      cp $COMIN/rundata/${CDUMP}wave.mod_def.${grdID} mod_def.$grdID
 
     else
       set +x
@@ -196,7 +196,7 @@
 
   for grdID in ${grdALL}
   do
-    if [ -f ${COMOUT}/rundata/${COMPONENTwave}.mod_def.$grdID ]
+    if [ -f ${COMOUT}/rundata/${CDUMP}wave.mod_def.$grdID ]
     then
       set +x
       echo ' '
diff --git a/scripts/exwave_post_sbs.sh b/scripts/exgfs_wave_post_sbs.sh
similarity index 98%
rename from scripts/exwave_post_sbs.sh
rename to scripts/exgfs_wave_post_sbs.sh
index a836fa85f9..fe37a689bf 100755
--- a/scripts/exwave_post_sbs.sh
+++ b/scripts/exgfs_wave_post_sbs.sh
@@ -39,6 +39,10 @@
   export LOUD=${LOUD:-YES}; [[ $LOUD = yes ]] && export LOUD=YES
   [[ "$LOUD" != YES ]] && set +x
 
+  # Set wave model ID tag to include member number
+  # if ensemble; waveMEMB var empty in deterministic
+  export WAV_MOD_TAG=${CDUMP}wave${waveMEMB}
+
   cd $DATA
 
   postmsg "$jlogfile" "HAS BEGUN on `hostname`"
@@ -138,13 +142,13 @@
 # Copy model definition files
   for grdID in $waveGRD $wavesbsGRD $wavepostGRD $waveinterpGRD $waveuoutpGRD
   do
-    if [ -f "$COMIN/rundata/${COMPONENTwave}.mod_def.${grdID}" ]
+    if [ -f "$COMIN/rundata/${CDUMP}wave.mod_def.${grdID}" ]
     then
       set +x
       echo " Mod def file for $grdID found in ${COMIN}/rundata. copying ...."
       [[ "$LOUD" = YES ]] && set -x
 
-      cp -f $COMIN/rundata/${COMPONENTwave}.mod_def.${grdID} mod_def.$grdID
+      cp -f $COMIN/rundata/${CDUMP}wave.mod_def.${grdID} mod_def.$grdID
       iloop=`expr $iloop + 1`
     fi
   done
diff --git a/scripts/exwave_prep.sh b/scripts/exgfs_wave_prep.sh
similarity index 95%
rename from scripts/exwave_prep.sh
rename to scripts/exgfs_wave_prep.sh
index d687600b1a..256bdfd146 100755
--- a/scripts/exwave_prep.sh
+++ b/scripts/exgfs_wave_prep.sh
@@ -46,6 +46,10 @@
   export LOUD=${LOUD:-YES}; [[ $LOUD = yes ]] && export LOUD=YES
   [[ "$LOUD" != YES ]] && set +x
 
+  # Set wave model ID tag to include member number
+  # if ensemble; waveMEMB var empty in deterministic
+  export WAV_MOD_TAG=${CDUMP}wave${waveMEMB}
+
   cd $DATA
   mkdir outtmp
 
@@ -66,8 +70,8 @@
   echo ' '
   [[ "$LOUD" = YES ]] && set -x
 
-#  export MP_PGMMODEL=mpmd
-#  export MP_CMDFILE=./cmdfile
+  #  export MP_PGMMODEL=mpmd
+  #  export MP_CMDFILE=./cmdfile
 
   if [ "$INDRUN" = 'no' ]
   then
@@ -76,19 +80,19 @@
     FHMAX_WAV=${FHMAX_WAV:-384}
   fi
 
-# 0.b Date and time stuff
+  # 0.b Date and time stuff
 
-# Beginning time for outpupt may differ from SDATE if DOIAU=YES
+  # Beginning time for outpupt may differ from SDATE if DOIAU=YES
   export date=$PDY
   export YMDH=${PDY}${cyc}
-# Roll back $IAU_FHROT hours of DOIAU=YES
+  # Roll back $IAU_FHROT hours of DOIAU=YES
   IAU_FHROT=3
   if [ "$DOIAU" = "YES" ]
   then
     WAVHINDH=$(( WAVHINDH + IAU_FHROT ))
   fi
-# Set time stamps for model start and output
-# For special case when IAU is on but this is an initial half cycle 
+  # Set time stamps for model start and output
+  # For special case when IAU is on but this is an initial half cycle 
   if [ $IAU_OFFSET = 0 ]; then
     ymdh_beg=$YMDH
   else
@@ -100,14 +104,14 @@
   ymdh_beg_out=$YMDH
   time_beg_out="`echo $ymdh_beg_out | cut -c1-8` `echo $ymdh_beg_out | cut -c9-10`0000"
 
-# Restart file times (already has IAU_FHROT in WAVHINDH) 
+  # Restart file times (already has IAU_FHROT in WAVHINDH) 
   RSTOFFSET=$(( ${WAVHCYC} - ${WAVHINDH} ))
-# Update restart time is added offset relative to model start
+  # Update restart time is added offset relative to model start
   RSTOFFSET=$(( ${RSTOFFSET} + ${RSTIOFF_WAV} ))
   ymdh_rst_ini=`$NDATE ${RSTOFFSET} $YMDH`
   RST2OFFSET=$(( DT_2_RST_WAV / 3600 ))
   ymdh_rst2_ini=`$NDATE ${RST2OFFSET} $YMDH` # DT2 relative to first-first-cycle restart file
-# First restart file for cycling
+  # First restart file for cycling
   time_rst_ini="`echo $ymdh_rst_ini | cut -c1-8` `echo $ymdh_rst_ini | cut -c9-10`0000"
   if [ ${DT_1_RST_WAV} = 1 ]; then
     time_rst1_end=${time_rst_ini}
@@ -116,11 +120,11 @@
     ymdh_rst1_end=`$NDATE $RST1OFFSET $ymdh_rst_ini`
     time_rst1_end="`echo $ymdh_rst1_end | cut -c1-8` `echo $ymdh_rst1_end | cut -c9-10`0000"
   fi
-# Second restart file for checkpointing
+  # Second restart file for checkpointing
   if [ "${RSTTYPE_WAV}" = "T" ]; then
     time_rst2_ini="`echo $ymdh_rst2_ini | cut -c1-8` `echo $ymdh_rst2_ini | cut -c9-10`0000"
     time_rst2_end=$time_end
-# Condition for gdas run or any other run when checkpoint stamp is > ymdh_end
+  # Condition for gdas run or any other run when checkpoint stamp is > ymdh_end
     if [ $ymdh_rst2_ini -ge $ymdh_end ]; then
       ymdh_rst2_ini=`$NDATE 3 $ymdh_end`
       time_rst2_ini="`echo $ymdh_rst2_ini | cut -c1-8` `echo $ymdh_rst2_ini | cut -c9-10`0000"
@@ -141,16 +145,16 @@
   echo ' '
   [[ "$LOUD" = YES ]] && set -x
 
-# Script will run only if pre-defined NTASKS
-#     The actual work is distributed over these tasks.
+  # Script will run only if pre-defined NTASKS
+  #     The actual work is distributed over these tasks.
   if [ -z ${NTASKS} ]        
   then
     echo "FATAL ERROR: Requires NTASKS to be set "
     err=1; export err;${errchk}
   fi
 
-# --------------------------------------------------------------------------- #
-# 1.  Get files that are used by most child scripts
+  # --------------------------------------------------------------------------- #
+  # 1.  Get files that are used by most child scripts
 
   set +x
   echo 'Preparing input files :'
@@ -158,7 +162,7 @@
   echo ' '
   [[ "$LOUD" = YES ]] && set -x
 
-# 1.a Model definition files
+  # 1.a Model definition files
 
   rm -f cmdfile
   touch cmdfile
@@ -172,12 +176,12 @@
 
   for grdID in $grdINP $waveGRD
   do
-    if [ -f "$COMIN/rundata/${COMPONENTwave}.mod_def.${grdID}" ]
+    if [ -f "$COMIN/rundata/${CDUMP}wave.mod_def.${grdID}" ]
     then
       set +x
       echo " Mod def file for $grdID found in ${COMIN}/rundata. copying ...."
       [[ "$LOUD" = YES ]] && set -x
-      cp $COMIN/rundata/${COMPONENTwave}.mod_def.${grdID} mod_def.$grdID
+      cp $COMIN/rundata/${CDUMP}wave.mod_def.${grdID} mod_def.$grdID
 
     else
       msg="FATAL ERROR: NO MODEL DEFINITION FILE"
@@ -195,7 +199,7 @@
     fi
   done
 
-# 1.b Netcdf Preprocessor template files
+  # 1.b Netcdf Preprocessor template files
    if [ "$WW3ATMINP" = 'YES' ]; then itype="$itype wind" ; fi 
    if [ "$WW3ICEINP" = 'YES' ]; then itype="$itype ice" ; fi 
    if [ "$WW3CURINP" = 'YES' ]; then itype="$itype cur" ; fi 
@@ -750,7 +754,7 @@
         cat $file >> cur.${WAVECUR_FID}
       done
 
-      cp -f cur.${WAVECUR_FID} ${COMOUT}/rundata/${COMPONENTwave}.${WAVECUR_FID}.$cycle.cur 
+      cp -f cur.${WAVECUR_FID} ${COMOUT}/rundata/${CDUMP}wave.${WAVECUR_FID}.$cycle.cur 
 
     else
       echo ' '
diff --git a/scripts/exglobal_fcst_nemsfv3gfs.sh b/scripts/exglobal_fcst_nemsfv3gfs.sh
index 90b50df9c2..66f0d81da1 100755
--- a/scripts/exglobal_fcst_nemsfv3gfs.sh
+++ b/scripts/exglobal_fcst_nemsfv3gfs.sh
@@ -40,6 +40,7 @@ machine=${machine:-"WCOSS_C"}
 machine=$(echo $machine | tr '[a-z]' '[A-Z]')
 
 # Cycling and forecast hour specific parameters 
+CDUMPwave="${CDUMP}wave"
 CASE=${CASE:-C768}
 CDATE=${CDATE:-2017032500}
 CDUMP=${CDUMP:-gdas}
@@ -151,16 +152,16 @@ mkdir -p $DATA/INPUT
 
 if [ $cplwav = ".true." ]; then 
     if [ $CDUMP = "gdas" ]; then
-        RSTDIR_WAVE=$ROTDIR/${CDUMP}wave.${PDY}/${cyc}/restart
+      RSTDIR_WAVE=$ROTDIR/${CDUMP}.${PDY}/${cyc}/wave/restart
     else
-        RSTDIR_WAVE=${RSTDIR_WAVE:-$ROTDIR/${CDUMP}wave.${PDY}/${cyc}/restart}
+      RSTDIR_WAVE=${RSTDIR_WAVE:-$ROTDIR/${CDUMP}.${PDY}/${cyc}/wave/restart}
     fi
     if [ ! -d $RSTDIR_WAVE ]; then mkdir -p $RSTDIR_WAVE ; fi
     $NLN $RSTDIR_WAVE restart_wave
 fi
 
 if [ $CDUMP = "gfs" -a $rst_invt1 -gt 0 ]; then
-    RSTDIR_ATM=${RSTDIR:-$ROTDIR}/${CDUMP}.${PDY}/${cyc}/RERUN_RESTART
+    RSTDIR_ATM=${RSTDIR:-$ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos/RERUN_RESTART
     if [ ! -d $RSTDIR_ATM ]; then mkdir -p $RSTDIR_ATM ; fi
     $NLN $RSTDIR_ATM RESTART
 else
@@ -202,13 +203,13 @@ else
   rprefix=enkf$rCDUMP
   memchar=mem$(printf %03i $MEMBER)
 fi
-memdir=$ROTDIR/${prefix}.$PDY/$cyc/$memchar
+memdir=$ROTDIR/${prefix}.$PDY/$cyc/atmos/$memchar
 if [ ! -d $memdir ]; then mkdir -p $memdir; fi
 
 GDATE=$($NDATE -$assim_freq $CDATE)
 gPDY=$(echo $GDATE | cut -c1-8)
 gcyc=$(echo $GDATE | cut -c9-10)
-gmemdir=$ROTDIR/${rprefix}.$gPDY/$gcyc/$memchar
+gmemdir=$ROTDIR/${rprefix}.$gPDY/$gcyc/atmos/$memchar
 sCDATE=$($NDATE -3 $CDATE)
 
 if [[ "$DOIAU" = "YES" ]]; then
@@ -410,26 +411,26 @@ fi
 
 #-------------wavewave----------------------
 if [ $cplwav = ".true." ]; then
-#-------------wavewave----------------------
 
-  for file in $(ls $ROTDIR/${CDUMP}wave.${PDY}/${cyc}/rundata/rmp_src_to_dst_conserv_*) ; do
+  for file in $(ls $COMINwave/rundata/rmp_src_to_dst_conserv_*) ; do
     $NLN $file $DATA/
   done
-  $NLN $ROTDIR/${CDUMP}wave.${PDY}/${cyc}/rundata/ww3_multi.${CDUMP}wave${WAV_MEMBER}.${cycle}.inp $DATA/ww3_multi.inp
+  $NLN $COMINwave/rundata/ww3_multi.${CDUMPwave}${WAV_MEMBER}.${cycle}.inp $DATA/ww3_multi.inp
 
   array=($WAVECUR_FID $WAVEICE_FID $WAVEWND_FID $waveuoutpGRD $waveGRD $waveesmfGRD $wavesbsGRD $wavepostGRD $waveinterpGRD)
   grdALL=`printf "%s\n" "${array[@]}" | sort -u | tr '\n' ' '`
+
   for wavGRD in ${grdALL}; do
-    $NLN $ROTDIR/${CDUMP}wave.${PDY}/${cyc}/rundata/${CDUMP}wave.mod_def.$wavGRD $DATA/mod_def.$wavGRD
+    $NLN $COMINwave/rundata/${CDUMPwave}.mod_def.$wavGRD $DATA/mod_def.$wavGRD
   done
 
-  WAVHCYC=${WAVHCYC:-6}
-  WRDATE=`$NDATE -${WAVHCYC} $CDATE`
-  WRPDY=`echo $WRDATE | cut -c1-8`
-  WRcyc=`echo $WRDATE | cut -c9-10`
-  WRDIR=$ROTDIR/gdaswave.${WRPDY}/${WRcyc}/restart
-  datwave=$ROTDIR/${CDUMP}wave.${PDY}/${cyc}/rundata/
-  wavprfx=${CDUMP}wave${WAV_MEMBER}
+  export WAVHCYC=${WAVHCYC:-6}
+  export WRDATE=`$NDATE -${WAVHCYC} $CDATE`
+  export WRPDY=`echo $WRDATE | cut -c1-8`
+  export WRcyc=`echo $WRDATE | cut -c9-10`
+  export WRDIR=${ROTDIR}/${CDUMPRSTwave}.${WRPDY}/${WRcyc}/wave/restart
+  export datwave=$COMOUTwave/rundata
+  export wavprfx=${CDUMPwave}${WAV_MEMBER}
 
   for wavGRD in $waveGRD ; do
     if [ $RERUN = "NO" ]; then
@@ -441,7 +442,7 @@ if [ $cplwav = ".true." ]; then
   done
 
   if [ "$WW3ICEINP" = "YES" ]; then
-    wavicefile=$ROTDIR/${CDUMP}wave.${PDY}/${cyc}/rundata/${CDUMP}wave.${WAVEICE_FID}.${cycle}.ice
+    wavicefile=$COMINwave/rundata/${CDUMPwave}.${WAVEICE_FID}.${cycle}.ice
     if [ ! -f $wavicefile ]; then
       echo "ERROR: WW3ICEINP = ${WW3ICEINP}, but missing ice file"
       echo "Abort!"
@@ -451,7 +452,7 @@ if [ $cplwav = ".true." ]; then
   fi
 
   if [ "$WW3CURINP" = "YES" ]; then
-    wavcurfile=$ROTDIR/${CDUMP}wave.${PDY}/${cyc}/rundata/${CDUMP}wave.${WAVECUR_FID}.${cycle}.cur
+    wavcurfile=$COMINwave/rundata/${CDUMPwave}.${WAVECUR_FID}.${cycle}.cur
     if [ ! -f $wavcurfile ]; then
       echo "ERROR: WW3CURINP = ${WW3CURINP}, but missing current file"
       echo "Abort!"
@@ -463,6 +464,8 @@ if [ $cplwav = ".true." ]; then
   # Link output files
   cd $DATA
   eval $NLN $datwave/${wavprfx}.log.mww3.${PDY}${cyc} log.mww3
+
+  # Loop for gridded output (uses FHINC)
   fhr=$FHMIN_WAV
   while [ $fhr -le $FHMAX_WAV ]; do
     YMDH=`$NDATE $fhr $CDATE`
@@ -489,10 +492,8 @@ if [ $cplwav = ".true." ]; then
     fhr=$((fhr+FHINC))
   done
 
+fi #cplwav=true
 #-------------wavewave----------------------
-fi
-#-------------wavewave----------------------
-
 
 # inline post fix files
 if [ $WRITE_DOPOST = ".true." ]; then
diff --git a/scripts/run_gfsmos_master.sh.dell b/scripts/run_gfsmos_master.sh.dell
index 0892b5574f..b90d6434ed 100755
--- a/scripts/run_gfsmos_master.sh.dell
+++ b/scripts/run_gfsmos_master.sh.dell
@@ -85,7 +85,8 @@ export STMPROOT=$RUNDIR/gfsmos.$PDY
 export DATAROOT=$STMPROOT
 ##export MODELROOT=/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/gfsmos
 export MODELROOT=/gpfs/dell2/mdl/mdlstat/noscrub/usr/Scott.Scallion/gfsv16
-export MODELDIR=$MODELROOT/gfsmos.v5.2.0.1
+#export MODELDIR=$MODELROOT/gfsmos.v5.2.0.1
+export MODELDIR=$MODELROOT/gfsmos.v5.2.0.1-restructure
 export CODEDIR=/gpfs/dell1/nco/ops/nwpara/mos_shared.v2.6.5
 #--------------------------------
 
diff --git a/sorc/build_ufs_utils.sh b/sorc/build_ufs_utils.sh
index 464f3c27ae..292145d764 100755
--- a/sorc/build_ufs_utils.sh
+++ b/sorc/build_ufs_utils.sh
@@ -11,7 +11,5 @@ cd ufs_utils.fd/sorc
 
 ./build_all_ufs_utils.sh
 
-./link_fixdirs.sh emc $target
-
 exit
 
diff --git a/sorc/checkout.sh b/sorc/checkout.sh
index 096bf8f7d8..c188bd86d0 100755
--- a/sorc/checkout.sh
+++ b/sorc/checkout.sh
@@ -1,6 +1,23 @@
 #!/bin/sh
 set -xue
 
+while getopts "o" option;
+do
+ case $option in
+  o)
+   echo "Received -o flag for optional checkout of GTG, will check out GTG with EMC_post"
+   checkout_gtg="YES"
+   ;;
+  :)
+   echo "option -$OPTARG needs an argument"
+   ;;
+  *)
+   echo "invalid option -$OPTARG, exiting..."
+   exit
+   ;;
+ esac
+done
+
 topdir=$(pwd)
 echo $topdir
 
@@ -33,7 +50,7 @@ if [[ ! -d gldas.fd ]] ; then
     rm -f ${topdir}/checkout-gldas.log
     git clone https://github.com/NOAA-EMC/GLDAS  gldas.fd >> ${topdir}/checkout-gldas.fd.log 2>&1
     cd gldas.fd
-    git checkout gldas_gfsv16_release.v1.2.0
+    git checkout gldas_gfsv16_release.v1.4.0
     cd ${topdir}
 else
     echo 'Skip.  Directory gldas.fd already exists.'
@@ -55,7 +72,19 @@ if [[ ! -d gfs_post.fd ]] ; then
     rm -f ${topdir}/checkout-gfs_post.log
     git clone https://github.com/NOAA-EMC/EMC_post.git gfs_post.fd >> ${topdir}/checkout-gfs_post.log 2>&1
     cd gfs_post.fd
-    git checkout upp_gfsv16_release.v1.0.10
+    git checkout upp_gfsv16_release.v1.0.11
+    ################################################################################
+    # checkout_gtg
+    ## yes: The gtg code at NCAR private repository is available for ops. GFS only.
+    #       Only approved persons/groups have access permission.
+    ## no:  No need to check out gtg code for general GFS users.
+    ################################################################################
+    checkout_gtg=${checkout_gtg:-"NO"}
+    if [[ ${checkout_gtg} == "YES" ]] ; then
+      ./manage_externals/checkout_externals
+      cp sorc/post_gtg.fd/*f90 sorc/ncep_post.fd/.
+      cp sorc/post_gtg.fd/gtg.config.gfs parm/.
+    fi
     cd ${topdir}
 else
     echo 'Skip.  Directory gfs_post.fd already exists.'
diff --git a/sorc/link_fv3gfs.sh b/sorc/link_fv3gfs.sh
index 2a97467e25..7e41a8eddf 100755
--- a/sorc/link_fv3gfs.sh
+++ b/sorc/link_fv3gfs.sh
@@ -43,6 +43,10 @@ for dir in fix_am fix_chem fix_fv3 fix_fv3_gmted2010 fix_gldas fix_orog fix_sfc_
 done
 $LINK $FIX_DIR/* .
 
+if [ -d ${pwd}/ufs_utils.fd ]; then
+  cd ${pwd}/ufs_utils.fd/sorc
+  ./link_fixdirs.sh $RUN_ENVIR $machine
+fi
 
 #---------------------------------------
 #--add files from external repositories
diff --git a/ush/drive_makeprepbufr.sh b/ush/drive_makeprepbufr.sh
index c886b25f75..ad36904724 100755
--- a/ush/drive_makeprepbufr.sh
+++ b/ush/drive_makeprepbufr.sh
@@ -39,6 +39,8 @@ DONST=${DONST:-"NO"}
 
 ###############################################################
 # Set script and dependency variables
+export COMPONENT=${COMPONENT:-atmos}
+
 GDATE=$($NDATE -$assim_freq $CDATE)
 
 cymd=$(echo $CDATE | cut -c1-8)
@@ -54,8 +56,8 @@ APREFIX="${CDUMP}.t${chh}z."
 ASUFFIX=${ASUFFIX:-$SUFFIX}
 
 COMIN_OBS=${COMIN_OBS:-"$DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}"}
-COMIN_GES=${COMIN_GES:-"$ROTDIR/gdas.$gymd/$ghh"}
-COMOUT=${COMOUT:-"$ROTDIR/$CDUMP.$cymd/$chh"}
+COMIN_GES=${COMIN_GES:-"$ROTDIR/gdas.$gymd/$ghh/$COMPONENT"}
+COMOUT=${COMOUT:-"$ROTDIR/$CDUMP.$cymd/$chh/$COMPONENT"}
 [[ ! -d $COMOUT ]] && mkdir -p $COMOUT
 export DATA="$RUNDIR/$CDATE/$CDUMP/prepbufr"
 [[ -d $DATA ]] && rm -rf $DATA
diff --git a/ush/getdump.sh b/ush/getdump.sh
index 7e92115a1f..3766914f14 100755
--- a/ush/getdump.sh
+++ b/ush/getdump.sh
@@ -1,10 +1,12 @@
 #!/bin/ksh
 set -x
 
+export COMPONENT=${COMPONENT:-atmos}
+
 CDATE=${1:-""}
 CDUMP=${2:-""}
 SOURCE_DIR=${3:-$DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}}
-TARGET_DIR=${4:-$ROTDIR/${CDUMP}.${PDY}/$cyc}
+TARGET_DIR=${4:-$ROTDIR/${CDUMP}.${PDY}/$cyc/$COMPONENT}
 
 DUMP_SUFFIX=${DUMP_SUFFIX:-""}
 
diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh
index 7d0e2653c4..0bdf56650b 100755
--- a/ush/hpssarch_gen.sh
+++ b/ush/hpssarch_gen.sh
@@ -46,7 +46,7 @@ if [ $type = "gfs" ]; then
   touch gfs_${format}b.txt
   touch gfs_restarta.txt
 
-  dirpath="gfs.${PDY}/${cyc}/"
+  dirpath="gfs.${PDY}/${cyc}/atmos/"
   dirname="./${dirpath}"
 
   head="gfs.t${cyc}z."
@@ -148,7 +148,7 @@ if [ $type = "gfs" ]; then
     rm -rf gfswave.txt
     touch gfswave.txt
 
-    dirpath="gfswave.${PDY}/${cyc}/"
+    dirpath="gfs.${PDY}/${cyc}/wave/"
     dirname="./${dirpath}"
 
     head="gfswave.t${cyc}z."
@@ -176,7 +176,7 @@ if [ $type = "gdas" ]; then
   touch gdas_restarta.txt
   touch gdas_restartb.txt
 
-  dirpath="gdas.${PDY}/${cyc}/"
+  dirpath="gdas.${PDY}/${cyc}/atmos/"
   dirname="./${dirpath}"
   head="gdas.t${cyc}z."
 
@@ -273,7 +273,7 @@ if [ $type = "gdas" ]; then
     rm -rf gdaswave_restart.txt
     touch gdaswave_restart.txt
 
-    dirpath="gdaswave.${PDY}/${cyc}/"
+    dirpath="gdas.${PDY}/${cyc}/wave/"
     dirname="./${dirpath}"
 
     head="gdaswave.t${cyc}z."
@@ -307,7 +307,7 @@ if [ $type = "enkfgdas" -o $type = "enkfgfs" ]; then
 ##NTARS2=$((NTARS/2))  # number of earc groups to include analysis/increments
   NTARS2=$NTARS
 
-  dirpath="enkf${CDUMP}.${PDY}/${cyc}/"
+  dirpath="enkf${CDUMP}.${PDY}/${cyc}/atmos/"
   dirname="./${dirpath}"
   head="${CDUMP}.t${cyc}z."
 
@@ -378,7 +378,7 @@ if [ $type = "enkfgdas" -o $type = "enkfgfs" ]; then
   while [ $m -le $NMEM_EARCGRP ]; do
     nm=$(((n-1)*NMEM_EARCGRP+m))
     mem=$(printf %03i $nm)
-    dirpath="enkf${CDUMP}.${PDY}/${cyc}/mem${mem}/"
+    dirpath="enkf${CDUMP}.${PDY}/${cyc}/atmos/mem${mem}/"
     dirname="./${dirpath}"
     head="${CDUMP}.t${cyc}z."
 
diff --git a/ush/rocoto/setup_expt.py b/ush/rocoto/setup_expt.py
index d4841b3278..f2040e382b 100755
--- a/ush/rocoto/setup_expt.py
+++ b/ush/rocoto/setup_expt.py
@@ -92,7 +92,6 @@ def edit_baseconfig():
                     .replace('@NMEM_ENKF@', '%d' % nens) \
                     .replace('@HOMEgfs@', top) \
                     .replace('@BASE_GIT@', base_git) \
-                    .replace('@BASE_SVN@', base_svn) \
                     .replace('@DMPDIR@', dmpdir) \
                     .replace('@NWPROD@', nwprod) \
                     .replace('@HOMEDIR@', homedir) \
diff --git a/ush/rocoto/setup_expt_fcstonly.py b/ush/rocoto/setup_expt_fcstonly.py
index 79d6fa9ed8..2769b35aaf 100755
--- a/ush/rocoto/setup_expt_fcstonly.py
+++ b/ush/rocoto/setup_expt_fcstonly.py
@@ -66,7 +66,6 @@ def edit_baseconfig():
                     .replace('@CASECTL@', 'C%d' % res) \
                     .replace('@HOMEgfs@', top) \
                     .replace('@BASE_GIT@', base_git) \
-                    .replace('@BASE_SVN@', base_svn) \
                     .replace('@DMPDIR@', dmpdir) \
                     .replace('@NWPROD@', nwprod) \
                     .replace('@HOMEDIR@', homedir) \
diff --git a/ush/rocoto/setup_workflow.py b/ush/rocoto/setup_workflow.py
index b0559e4bed..41efd882b8 100755
--- a/ush/rocoto/setup_workflow.py
+++ b/ush/rocoto/setup_workflow.py
@@ -403,7 +403,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
     deps = []
     dep_dict = {'type': 'metatask', 'name': '%spost' % 'gdas', 'offset': '-06:00:00'}
     deps.append(rocoto.add_dependency(dep_dict))
-    data = '&ROTDIR;/gdas.@Y@m@d/@H/gdas.t@Hz.atmf009%s' % (gridsuffix)
+    data = '&ROTDIR;/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.atmf009%s' % (gridsuffix)
     dep_dict = {'type': 'data', 'data': data, 'offset': '-06:00:00'}
     deps.append(rocoto.add_dependency(dep_dict))
     data = '&DMPDIR;/%s%s.@Y@m@d/@H/%s.t@Hz.updated.status.tm00.bufr_d' % (cdump, dumpsuffix, cdump)
@@ -468,7 +468,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
 
     # analcalc
     deps = []
-    data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loginc.txt' % (cdump, cdump)
+    data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loginc.txt' % (cdump, cdump)
     dep_dict = {'type': 'data', 'data': data}
     deps.append(rocoto.add_dependency(dep_dict))
     dep_dict = {'type': 'task', 'name': '%sanal' % cdump}
@@ -486,7 +486,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
     # analdiag
     if cdump in ['gdas']:
         deps = []
-        data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loginc.txt' % (cdump, cdump)
+        data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loginc.txt' % (cdump, cdump)
         dep_dict = {'type': 'data', 'data': data}
         deps.append(rocoto.add_dependency(dep_dict))
         dep_dict = {'type': 'task', 'name': '%sanal' % cdump}
@@ -499,7 +499,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
     # gldas
     if cdump in ['gdas'] and do_gldas in ['Y', 'YES']:
         deps = []
-        data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loginc.txt' % (cdump, cdump)
+        data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loginc.txt' % (cdump, cdump)
         dep_dict = {'type': 'data', 'data': data}
         deps.append(rocoto.add_dependency(dep_dict))
         dep_dict = {'type': 'task', 'name': '%sanal' % cdump}
@@ -511,7 +511,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
 
     # fcst
     deps = []
-    #data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loginc.txt' % (cdump, cdump)
+    #data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loginc.txt' % (cdump, cdump)
     #dep_dict = {'type': 'data', 'data': data}
 #   #deps.append(rocoto.add_dependency(dep_dict))
     if do_wave in ['Y', 'YES'] and cdump in cdumps:
@@ -537,7 +537,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
 
     # post
     deps = []
-    data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.log#dep#.txt' % (cdump, cdump)
+    data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.log#dep#.txt' % (cdump, cdump)
     dep_dict = {'type': 'data', 'data': data}
     deps.append(rocoto.add_dependency(dep_dict))
     dep_dict = {'type': 'task', 'name': '%sfcst' % cdump}
@@ -558,13 +558,13 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
     # wavepostsbs
     if do_wave in ['Y', 'YES'] and cdump in cdumps:
         deps = []
-        data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.gnh_10m.@Y@m@d.@H0000' % (cdump,cdump)
+        data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.gnh_10m.@Y@m@d.@H0000' % (cdump,cdump)
         dep_dict = {'type': 'data', 'data': data}
         deps.append(rocoto.add_dependency(dep_dict))
-        data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.aoc_9km.@Y@m@d.@H0000' % (cdump,cdump)
+        data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.aoc_9km.@Y@m@d.@H0000' % (cdump,cdump)
         dep_dict = {'type': 'data', 'data': data}
         deps.append(rocoto.add_dependency(dep_dict))
-        data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.gsh_15m.@Y@m@d.@H0000' % (cdump,cdump)
+        data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.gsh_15m.@Y@m@d.@H0000' % (cdump,cdump)
         dep_dict = {'type': 'data', 'data': data}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
@@ -574,13 +574,13 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
     # wavegempaksbs
     #if do_wave in ['Y', 'YES'] and do_gempak in ['Y', 'YES'] and cdump in ['gfs']:
     #    deps = []
-    #    data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.gnh_10m.f000.grib2' % (cdump,cdump)
+    #    data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.gnh_10m.f000.grib2' % (cdump,cdump)
     #    dep_dict = {'type': 'data', 'data': data}
     #    deps.append(rocoto.add_dependency(dep_dict))
-    #    data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.aoc_9km.f000.grib2' % (cdump,cdump)
+    #    data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.aoc_9km.f000.grib2' % (cdump,cdump)
     #    dep_dict = {'type': 'data', 'data': data}
     #    deps.append(rocoto.add_dependency(dep_dict))
-    #    data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.gsh_15m.f000.grib2' % (cdump,cdump)
+    #    data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.gsh_15m.f000.grib2' % (cdump,cdump)
     #    dep_dict = {'type': 'data', 'data': data}
     #    deps.append(rocoto.add_dependency(dep_dict))
     #    dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
@@ -590,13 +590,13 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
     # waveawipssbs
     #if do_wave in ['Y', 'YES'] and do_awips in ['Y', 'YES'] and cdump in ['gfs']:
     #    deps = []
-    #    data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.gnh_10m.f000.grib2' % (cdump,cdump)
+    #    data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.gnh_10m.f000.grib2' % (cdump,cdump)
     #    dep_dict = {'type': 'data', 'data': data}
     #    deps.append(rocoto.add_dependency(dep_dict))
-    #    data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.aoc_9km.f000.grib2' % (cdump,cdump)
+    #    data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.aoc_9km.f000.grib2' % (cdump,cdump)
     #    dep_dict = {'type': 'data', 'data': data}
     #    deps.append(rocoto.add_dependency(dep_dict))
-    #    data = '&ROTDIR;/%swave.@Y@m@d/@H/%swave.t@Hz.gsh_15m.f000.grib2' % (cdump,cdump)
+    #    data = '&ROTDIR;/%s.@Y@m@d/@H/wave/%swave.t@Hz.gsh_15m.f000.grib2' % (cdump,cdump)
     #    dep_dict = {'type': 'data', 'data': data}
     #    deps.append(rocoto.add_dependency(dep_dict))
     #    dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
@@ -670,7 +670,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
     # awips
     if cdump in ['gfs'] and do_awips in ['Y', 'YES']:
         deps = []
-        data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.sfluxgrb#dep#.grib2.idx' % (cdump, cdump)
+        data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.pgrb2b.0p25.#dep#.idx' % (cdump, cdump)
         dep_dict = {'type': 'data', 'data': data}
         deps.append(rocoto.add_dependency(dep_dict))
         dep_dict = {'type': 'metatask', 'name': '%spost' % cdump}
@@ -818,7 +818,7 @@ def get_hyb_tasks(dict_configs, cycledef='enkf'):
 
     # ecmn, ecen
     deps1 = []
-    data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loganl.txt' % (cdump, cdump)
+    data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loganl.txt' % (cdump, cdump)
     dep_dict = {'type': 'data', 'data': data}
     deps1.append(rocoto.add_dependency(dep_dict))
     dep_dict = {'type': 'task', 'name': '%sanalcalc' % cdump}
@@ -844,7 +844,7 @@ def get_hyb_tasks(dict_configs, cycledef='enkf'):
 
     # esfc
     deps1 = []
-    data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.loganl.txt' % (cdump, cdump)
+    data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.loganl.txt' % (cdump, cdump)
     dep_dict = {'type': 'data', 'data': data}
     deps1.append(rocoto.add_dependency(dep_dict))
     dep_dict = {'type': 'task', 'name': '%sanalcalc' % cdump}
diff --git a/ush/rocoto/setup_workflow_fcstonly.py b/ush/rocoto/setup_workflow_fcstonly.py
index 168c9f08ae..8a308bb760 100755
--- a/ush/rocoto/setup_workflow_fcstonly.py
+++ b/ush/rocoto/setup_workflow_fcstonly.py
@@ -295,7 +295,7 @@ def get_workflow(dict_configs, cdump='gdas'):
 
     # waveinit
     if do_wave in ['Y', 'YES']:
-        task = wfu.create_wf_task('%swaveinit', cdump=cdump, envar=envars)
+        task = wfu.create_wf_task('waveinit', cdump=cdump, envar=envars)
         tasks.append(task)
         tasks.append('\n')
 
@@ -327,7 +327,7 @@ def get_workflow(dict_configs, cdump='gdas'):
 
     # post
     deps = []
-    data = '&ROTDIR;/%s.@Y@m@d/@H/%s.t@Hz.log#dep#.txt' % (cdump, cdump)
+    data = '&ROTDIR;/%s.@Y@m@d/@H/atmos/%s.t@Hz.log#dep#.txt' % (cdump, cdump)
     dep_dict = {'type': 'data', 'data': data}
     deps.append(rocoto.add_dependency(dep_dict))
     dependencies = rocoto.create_dependency(dep=deps)
@@ -346,16 +346,16 @@ def get_workflow(dict_configs, cdump='gdas'):
     # wavepostsbs
     if do_wave in ['Y', 'YES']:
         deps = []
-        data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.gnh_10m.@Y@m@d.@H0000' % (cdump,cdump)
+        data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.gnh_10m.@Y@m@d.@H0000' % (cdump,cdump)
         dep_dict = {'type': 'data', 'data': data}
         deps.append(rocoto.add_dependency(dep_dict))
-        data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.aoc_9km.@Y@m@d.@H0000' % (cdump,cdump)
+        data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.aoc_9km.@Y@m@d.@H0000' % (cdump,cdump)
         dep_dict = {'type': 'data', 'data': data}
         deps.append(rocoto.add_dependency(dep_dict))
-        data = '&ROTDIR;/%swave.@Y@m@d/@H/rundata/%swave.out_grd.gsh_15m.@Y@m@d.@H0000' % (cdump,cdump)
+        data = '&ROTDIR;/%s.@Y@m@d/@H/wave/rundata/%swave.out_grd.gsh_15m.@Y@m@d.@H0000' % (cdump,cdump)
         dep_dict = {'type': 'data', 'data': data}
         deps.append(rocoto.add_dependency(dep_dict))
-        dependencies = rocoto.create_dependency(dep=deps)
+        dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
         task = wfu.create_wf_task('wavepostsbs', cdump=cdump, envar=envars, dependency=dependencies)
         tasks.append(task)
         tasks.append('\n')
@@ -395,13 +395,13 @@ def get_workflow(dict_configs, cdump='gdas'):
     # wavegempaksbs
     #if do_wave in ['Y', 'YES'] and do_gempak in ['Y', 'YES']:
     #    deps = []
-    #    data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.gnh_10m.f000.grib2'
+    #    data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.gnh_10m.f000.grib2'
     #    dep_dict = {'type': 'data', 'data': data}
     #    deps.append(rocoto.add_dependency(dep_dict))
-    #    data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.aoc_9km.f000.grib2'
+    #    data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.aoc_9km.f000.grib2'
     #    dep_dict = {'type': 'data', 'data': data}
     #    deps.append(rocoto.add_dependency(dep_dict))
-    #    data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.gsh_15m.f000.grib2'
+    #    data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.gsh_15m.f000.grib2'
     #    dep_dict = {'type': 'data', 'data': data}
     #    deps.append(rocoto.add_dependency(dep_dict))
     #    dependencies = rocoto.create_dependency(dep=deps)
@@ -412,13 +412,13 @@ def get_workflow(dict_configs, cdump='gdas'):
     # waveawipssbs
     #if do_wave in ['Y', 'YES'] and do_awips in ['Y', 'YES']:
     #    deps = []
-    #    data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.gnh_10m.f000.grib2'
+    #    data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.gnh_10m.f000.grib2'
     #    dep_dict = {'type': 'data', 'data': data}
     #    deps.append(rocoto.add_dependency(dep_dict))
-    #    data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.aoc_9km.f000.grib2'
+    #    data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.aoc_9km.f000.grib2'
     #    dep_dict = {'type': 'data', 'data': data}
     #    deps.append(rocoto.add_dependency(dep_dict))
-    #    data = '&ROTDIR;/wave.@Y@m@d/@H/wave.t@Hz.gsh_15m.f000.grib2'
+    #    data = '&ROTDIR;/wave.@Y@m@d/@H/wave/wave.t@Hz.gsh_15m.f000.grib2'
     #    dep_dict = {'type': 'data', 'data': data}
     #    deps.append(rocoto.add_dependency(dep_dict))
     #    dependencies = rocoto.create_dependency(dep=deps)
diff --git a/ush/wave_grid_moddef.sh b/ush/wave_grid_moddef.sh
index 9eb41aaba1..640769f991 100755
--- a/ush/wave_grid_moddef.sh
+++ b/ush/wave_grid_moddef.sh
@@ -109,7 +109,7 @@
  
   if [ -f mod_def.ww3 ]
   then
-    cp mod_def.ww3 $COMOUT/rundata/${COMPONENTwave}.mod_def.${grdID}
+    cp mod_def.ww3 $COMOUT/rundata/${CDUMP}wave.mod_def.${grdID}
     mv mod_def.ww3 ../mod_def.$grdID
   else
     set +x
diff --git a/ush/wave_prnc_ice.sh b/ush/wave_prnc_ice.sh
index fcc1cab0c9..254edc8b03 100755
--- a/ush/wave_prnc_ice.sh
+++ b/ush/wave_prnc_ice.sh
@@ -46,7 +46,7 @@
   echo '!         Make ice fields        |'
   echo '+--------------------------------+'
   echo "   Model TAG       : $WAV_MOD_TAG"
-  echo "   Model ID        : $COMPONENTwave"
+  echo "   Model ID        : ${CDUMP}wave"
   echo "   Ice grid ID     : $WAVEICE_FID"
   echo "   Ice file        : $WAVICEFILE"
   echo ' '
@@ -56,7 +56,7 @@
   if [ -z "$YMDH" ] || [ -z "$cycle" ] || \
      [ -z "$COMOUT" ] || [ -z "$FIXwave" ] || [ -z "$EXECwave" ] || \
      [ -z "$WAV_MOD_TAG" ] || [ -z "$WAVEICE_FID" ] || [ -z "$SENDCOM" ] || \
-     [ -z "$COMIN_WAV_ICE" ] || [ -z "$COMPONENTwave" ]
+     [ -z "$COMIN_WAV_ICE" ]
   then
     set $setoff
     echo ' '
@@ -172,7 +172,7 @@
     icefile=${WAV_MOD_TAG}.${WAVEICE_FID}.$cycle.ice
   elif [ "${WW3ATMIENS}" = "F" ]
   then 
-    icefile=${COMPONENTwave}.${WAVEICE_FID}.$cycle.ice
+    icefile=${CDUMP}wave.${WAVEICE_FID}.$cycle.ice
   fi
  
   set $setoff