diff --git a/env/HERA.env b/env/HERA.env
index bd7e34ca31..58be66fdad 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 c12ec6a327..8ad4ec94ba 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/jobs/JGDAS_GEMPAK b/jobs/JGDAS_GEMPAK
index 7c76eed951..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}/atmos}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/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 91463d6ab6..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}/atmos/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}/atmos/gempak/meta}
-export COMOUTncdc=${COMOUTncdc:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
+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 950f263ed2..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}/atmos}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
+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 8a325ba282..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}/atmos}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
+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 9e0251de45..e43edbbaca 100755
--- a/jobs/JGFS_CYCLONE_GENESIS
+++ b/jobs/JGFS_CYCLONE_GENESIS
@@ -53,6 +53,7 @@ setpdy.sh
 ####################################
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
+export COMPONENT=${COMPONENT:-atmos}
 
 ##############################################
 # Determine Job Output Name on System
@@ -90,10 +91,10 @@ export SCRIPTens_tracker=${SCRIPTens_tracker:-$HOMEens_tracker/scripts}
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos
+export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT
 export gfsdir=${COMIN}
 export COMINgfs=${COMIN}
-export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos
+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 6b234b1a0c..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}/atmos
+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}/atmos
+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 5928837e1c..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}/atmos}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
+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 806c7fd3c2..f50c834639 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}
 
 
 ##############################################
@@ -93,13 +94,13 @@ export USHens_tracker=${USHens_tracker:-$HOMEens_tracker/ush}
 ##############################################
 # Define COM and Data directories
 ##############################################
-export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos
+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}/atmos
+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_GEMPAK b/jobs/JGFS_GEMPAK
index 77301ceb52..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}/atmos}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/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 7d12d7083b..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}/atmos/gempak}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/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 79fd63c61b..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}/atmos/gempak}
-export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/atmos}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
+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 f260613311..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}/atmos}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${NET}.${PDY}/${cyc}/atmos/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 29e522da4b..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}/atmos}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
+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 32f81c2b50..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}/atmos}
-export COMOUT=${COMOUT:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
+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_FORECAST b/jobs/JGLOBAL_FORECAST
index 6f53551275..2278b43f73 100755
--- a/jobs/JGLOBAL_FORECAST
+++ b/jobs/JGLOBAL_FORECAST
@@ -65,6 +65,8 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gfs"}}
+export COMPONENTatmos=${COMPONENTatmos:-atmos}
+export COMPONENTwave=${COMPONENTwave:-wave}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
     export RSTDIR=${GESROOT:?}/$envir
@@ -74,8 +76,8 @@ fi
 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}
+  export COMINwave=${COMINwave:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENTwave}
+  export COMOUTwave=${COMOUTwave:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENTwave}
 fi
 
 ##############################################
diff --git a/jobs/JGLOBAL_TROPCY_QC_RELOC b/jobs/JGLOBAL_TROPCY_QC_RELOC
index 1896fa58da..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}/atmos
-export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos
+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 80%
rename from jobs/JWAVE_INIT
rename to jobs/JGLOBAL_WAVE_INIT
index 2f1ab90ff4..12218bf3b3 100755
--- a/jobs/JWAVE_INIT
+++ b/jobs/JGLOBAL_WAVE_INIT
@@ -27,15 +27,11 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-
-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
@@ -57,17 +53,17 @@ 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 COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
+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
@@ -79,7 +75,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 87%
rename from jobs/JWAVE_POST_SBS
rename to jobs/JGLOBAL_WAVE_POST_SBS
index ae09c2de56..13a2d3c7a5 100755
--- a/jobs/JWAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -27,6 +27,7 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
+export COMPONENT=${COMPONENT:-wave}
 
 export HOMEgefs=${HOMEgefs:-$NWROOT/$NET.${gefs_ver}}
 export HOMEgfs=${HOMEgfs:-$NWROOT/$NET.${gfs_ver}}
@@ -34,9 +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}
@@ -58,17 +56,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 COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
+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}
@@ -96,7 +94,7 @@ 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 100%
rename from jobs/JWAVE_PREP
rename to jobs/JGLOBAL_WAVE_PREP
diff --git a/jobs/rocoto/arch.sh b/jobs/rocoto/arch.sh
index dd037e32bd..52a40d9924 100755
--- a/jobs/rocoto/arch.sh
+++ b/jobs/rocoto/arch.sh
@@ -27,6 +27,9 @@ for config in $configs; do
     [[ $status -ne 0 ]] && exit $status
 done
 
+export COMPONENTatmos=${COMPONENTatmos:-atmos}
+export COMPONENTwave=${COMPONENTwave:-wave}
+
 # ICS are restarts and always lag INC by $assim_freq hours
 ARCHINC_CYC=$ARCH_CYC
 ARCHICS_CYC=$((ARCH_CYC-assim_freq))
@@ -57,7 +60,7 @@ PDY_MOS=$(echo $CDATE_MOS | cut -c1-8)
 # Archive online for verification and diagnostics
 ###############################################################
 
-COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
+COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENTatmos"
 cd $COMIN
 
 [[ ! -d $ARCDIR ]] && mkdir -p $ARCDIR
@@ -304,8 +307,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/atmos"
-    COMINwave="$ROTDIR/${CDUMP}.$gPDY/$gcyc/wave"
+    COMIN="$ROTDIR/${CDUMP}.$gPDY/$gcyc/$COMPONENTatmos"
+    COMINwave="$ROTDIR/${CDUMP}.$gPDY/$gcyc/$COMPONENTwave"
     COMINrtofs="$ROTDIR/rtofs.$gPDY"
     if [ -d $COMIN ]; then
         rocotolog="$EXPDIR/logs/${GDATE}.log"
diff --git a/jobs/rocoto/awips.sh b/jobs/rocoto/awips.sh
index 1960a45a2f..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/atmos"
+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/atmos"
+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 13195fb36b..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/atmos/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/atmos/${CDUMP}.t${cyc}z.enkfstat         enkfstat.${CDUMP}.$CDATE
-    $NCP $ROTDIR/enkf${CDUMP}.$PDY/$cyc/atmos/${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/atmos/${CDUMP}.t${cyc}z.enkfstat         enkfstat.gfs.$CDATE
-		$NCP $ROTDIR/enkfgfs.$PDY/$cyc/atmos/${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
@@ -160,9 +162,9 @@ if [ $ENSGRP -eq 0 ]; then
     gcyc=$(echo $GDATE | cut -c9-10)
 
     # Handle GDAS and GFS EnKF directories separately
-    COMIN_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/atmos"
+    COMIN_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/$COMPONENT"
     [[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS
-    COMIN_ENS="$ROTDIR/enkfgfs.$gPDY/$gcyc/atmos"
+    COMIN_ENS="$ROTDIR/enkfgfs.$gPDY/$gcyc/$COMPONENT"
     [[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS
 
     # PREVIOUS day 00Z remove the whole day
diff --git a/jobs/rocoto/fv3ic.sh b/jobs/rocoto/fv3ic.sh
index 6d952957b6..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/atmos"
+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 36fd51a70a..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/atmos"
+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/atmos/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 9a72f58e38..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/atmos
+  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 c90aa134ea..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/atmos"
+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 ccef979b39..4a253db31e 100755
--- a/jobs/rocoto/post.sh
+++ b/jobs/rocoto/post.sh
@@ -11,12 +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}/atmos/${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}/atmos/${CDUMP}.t${cyc}z.logf
+    restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/$COMPONENT/${CDUMP}.t${cyc}z.logf
 fi
 
 
@@ -32,8 +34,8 @@ for fhr in $fhrlst; do
         continue
     fi
 
-    #master=$ROTDIR/${CDUMP}.${PDY}/${cyc}/atmos/${CDUMP}.t${cyc}z.master.grb2f${fhr}
-    pgb0p25=$ROTDIR/${CDUMP}.${PDY}/${cyc}/atmos/${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 191ce46cb8..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/atmos"
+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/atmos"
+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 0f4edf2be9..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/atmos"
+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/atmos"
+   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,15 +91,15 @@ if [ $DO_MAKEPREPBUFR = "YES" ]; then
 
     export job="j${CDUMP}_prep_${cyc}"
     export DATAROOT="$RUNDIR/$CDATE/$CDUMP/prepbufr"
-    #export COMIN=${COMIN:-$ROTDIR/$CDUMP.$PDY/$cyc/atmos}
+    #export COMIN=${COMIN:-$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT}
     export COMIN=${COMIN:-$ROTDIR}
-    export COMINgdas=${COMINgdas:-$ROTDIR/gdas.$PDY/$cyc/atmos}
-    export COMINgfs=${COMINgfs:-$ROTDIR/gfs.$PDY/$cyc/atmos}
+    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}/atmos/$CDUMP.t${cyc}z.}
+      export COMSP=${COMSP:-$ROTDIR/${CDUMP}.${PDY}/${cyc}/$COMPONENT/$CDUMP.t${cyc}z.}
     fi
 
     $HOMEobsproc_network/jobs/JGLOBAL_PREP
diff --git a/jobs/rocoto/vrfy.sh b/jobs/rocoto/vrfy.sh
index 079a807fe5..194e052f37 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/atmos"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
 export DATAROOT="$RUNDIR/$CDATE/$CDUMP/vrfy"
 [[ -d $DATAROOT ]] && rm -rf $DATAROOT
 mkdir -p $DATAROOT
@@ -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/atmos"
+    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/atmos"
+    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/atmos"
+    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/parm/config/config.wave b/parm/config/config.wave
index c0ffcebc35..427a71a872 100755
--- a/parm/config/config.wave
+++ b/parm/config/config.wave
@@ -13,8 +13,9 @@ export wave_sys_ver=v1.0.0
 # This config contains variables/parameters used in the fcst step
 # Some others are also used across the workflow in wave component scripts
 
-export COMINwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave
-export COMOUTwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave
+export COMPONENTwave=${COMPONENTwave:-wave}
+export COMINwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENTwave
+export COMOUTwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENTwave
 
 # General runtime labels
 export CDUMPwave="${CDUMP}wave"
diff --git a/scripts/exwave_init.sh b/scripts/exgfs_wave_init.sh
similarity index 100%
rename from scripts/exwave_init.sh
rename to scripts/exgfs_wave_init.sh
diff --git a/scripts/exwave_post_sbs.sh b/scripts/exgfs_wave_post_sbs.sh
similarity index 100%
rename from scripts/exwave_post_sbs.sh
rename to scripts/exgfs_wave_post_sbs.sh
diff --git a/scripts/exwave_prep.sh b/scripts/exgfs_wave_prep.sh
similarity index 100%
rename from scripts/exwave_prep.sh
rename to scripts/exgfs_wave_prep.sh
diff --git a/scripts/exglobal_fcst_nemsfv3gfs.sh b/scripts/exglobal_fcst_nemsfv3gfs.sh
index 5b68578e78..e39d01db59 100755
--- a/scripts/exglobal_fcst_nemsfv3gfs.sh
+++ b/scripts/exglobal_fcst_nemsfv3gfs.sh
@@ -40,6 +40,8 @@ machine=${machine:-"WCOSS_C"}
 machine=$(echo $machine | tr '[a-z]' '[A-Z]')
 
 # Cycling and forecast hour specific parameters 
+COMPONENTatmos=${COMPONENTatmos:-atmos}
+COMPONENTwave=${COMPONENTwave:-wave}
 CDUMPwave="${CDUMP}wave"
 CASE=${CASE:-C768}
 CDATE=${CDATE:-2017032500}
@@ -151,17 +153,13 @@ cd $DATA || exit 8
 mkdir -p $DATA/INPUT
 
 if [ $cplwav = ".true." ]; then 
-    if [ $CDUMP = "gdas" ]; then
-        RSTDIR_WAVE=$ROTDIR/${CDUMP}wave.${PDY}/${cyc}/restart
-    else
-        RSTDIR_WAVE=${RSTDIR_WAVE:-$ROTDIR/${CDUMP}wave.${PDY}/${cyc}/restart}
-    fi
+    RSTDIR_WAVE=$ROTDIR/${CDUMP}.${PDY}/${cyc}/$COMPONENTwave/restart
     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}/atmos/RERUN_RESTART
+    RSTDIR_ATM=${RSTDIR:-$ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENTatmos/RERUN_RESTART
     if [ ! -d $RSTDIR_ATM ]; then mkdir -p $RSTDIR_ATM ; fi
     $NLN $RSTDIR_ATM RESTART
 else
@@ -203,13 +201,13 @@ else
   rprefix=enkf$rCDUMP
   memchar=mem$(printf %03i $MEMBER)
 fi
-memdir=$ROTDIR/${prefix}.$PDY/$cyc/atmos/$memchar
+memdir=$ROTDIR/${prefix}.$PDY/$cyc/$COMPONENTatmos/$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/atmos/$memchar
+gmemdir=$ROTDIR/${rprefix}.$gPDY/$gcyc/$COMPONENTatmos/$memchar
 sCDATE=$($NDATE -3 $CDATE)
 
 if [[ "$DOIAU" = "YES" ]]; then
@@ -434,7 +432,7 @@ if [ $cplwav = ".true." ]; then
   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 WRDIR=${ROTDIR}/${CDUMPRSTwave}.${WRPDY}/${WRcyc}/$COMPONENTwave/restart
   export datwave=$COMOUTwave/rundata
   export wavprfx=${CDUMPwave}${WAV_MEMBER}
 
diff --git a/sorc/link_fv3gfs.sh b/sorc/link_fv3gfs.sh
index 462763830f..07fd399bc7 100755
--- a/sorc/link_fv3gfs.sh
+++ b/sorc/link_fv3gfs.sh
@@ -64,7 +64,7 @@ cd ${pwd}/../scripts            ||exit 8
     $LINK ../sorc/gldas.fd/scripts/exgdas_gldas.sh.ecf .             
 cd ${pwd}/../ush                ||exit 8
     for file in fv3gfs_downstream_nems.sh  fv3gfs_dwn_nems.sh  gfs_nceppost.sh  \
-        gfs_transfer.sh  link_crtm_fix.sh  trim_rh.sh fix_precip.sh; do
+        gfs_transfer.sh  mod_icec.sh link_crtm_fix.sh  trim_rh.sh fix_precip.sh; do
         $LINK ../sorc/gfs_post.fd/ush/$file                  .
     done
     for file in emcsfc_ice_blend.sh  fv3gfs_driver_grid.sh  fv3gfs_make_orog.sh  global_cycle_driver.sh \
diff --git a/ush/drive_makeprepbufr.sh b/ush/drive_makeprepbufr.sh
index b0d934a6ff..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/atmos"}
-COMOUT=${COMOUT:-"$ROTDIR/$CDUMP.$cymd/$chh/atmos"}
+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 fc5cec4e75..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/atmos}
+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 cdbf445ea4..b1bfb9b1d7 100755
--- a/ush/hpssarch_gen.sh
+++ b/ush/hpssarch_gen.sh
@@ -9,6 +9,8 @@ set -x
 
 type=${1:-gfs}                ##gfs, gdas, enkfgdas or enkfggfs
 
+COMPONENTatmos=${COMPONENTatmos:-atmos}
+COMPONENTwave=${COMPONENTwave:-wave}
 CDATE=${CDATE:-2018010100}
 PDY=$(echo $CDATE | cut -c 1-8)
 cyc=$(echo $CDATE | cut -c 9-10)
@@ -46,7 +48,7 @@ if [ $type = "gfs" ]; then
   touch gfs_${format}b.txt
   touch gfs_restarta.txt
 
-  dirpath="gfs.${PDY}/${cyc}/atmos"
+  dirpath="gfs.${PDY}/${cyc}/$COMPONENTatmos"
   dirname="./${dirpath}"
 
   head="gfs.t${cyc}z."
@@ -148,7 +150,7 @@ if [ $type = "gfs" ]; then
     rm -rf gfswave.txt
     touch gfswave.txt
 
-    dirpath="gfs.${PDY}/${cyc}/wave"
+    dirpath="gfs.${PDY}/${cyc}/$COMPONENTwave"
     dirname="./${dirpath}"
 
     head="gfswave.t${cyc}z."
@@ -176,7 +178,7 @@ if [ $type = "gdas" ]; then
   touch gdas_restarta.txt
   touch gdas_restartb.txt
 
-  dirpath="gdas.${PDY}/${cyc}/atmos"
+  dirpath="gdas.${PDY}/${cyc}/$COMPONENTatmos"
   dirname="./${dirpath}"
   head="gdas.t${cyc}z."
 
@@ -273,7 +275,7 @@ if [ $type = "gdas" ]; then
     rm -rf gdaswave_restart.txt
     touch gdaswave_restart.txt
 
-    dirpath="gdas.${PDY}/${cyc}/wave"
+    dirpath="gdas.${PDY}/${cyc}/$COMPONENTwave"
     dirname="./${dirpath}"
 
     head="gdaswave.t${cyc}z."
@@ -307,7 +309,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}/atmos"
+  dirpath="enkf${CDUMP}.${PDY}/${cyc}/$COMPONENTatmos"
   dirname="./${dirpath}"
   head="${CDUMP}.t${cyc}z."
 
@@ -378,7 +380,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}/atmos/mem${mem}/"
+    dirpath="enkf${CDUMP}.${PDY}/${cyc}/$COMPONENTatmos/mem${mem}/"
     dirname="./${dirpath}"
     head="${CDUMP}.t${cyc}z."