diff --git a/jobs/JGDAS_GEMPAK b/jobs/JGDAS_GEMPAK
index 2ae8d08c3f..a015da25e0 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 COMPONENTatmos=${COMPONENTatmos:-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/$COMPONENTatmos}}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENTatmos/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..7d9358eda0 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 COMPONENTatmos=${COMPONENTatmos:-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}/${COMPONENTatmos}/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}/${COMPONENTatmos}/gempak/meta}
+export COMOUTncdc=${COMOUTncdc:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
 
 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..3b703e6f79 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 COMPONENTatmos=${COMPONENTatmos:-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}/${COMPONENTatmos}}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_AWIPS_G2 b/jobs/JGFS_AWIPS_G2
index 6840bff2cc..f8f19cdc09 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 COMPONENTatmos=${COMPONENTatmos:-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}/${COMPONENTatmos}}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_CYCLONE_GENESIS b/jobs/JGFS_CYCLONE_GENESIS
index ad14bea99a..eef461455a 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 COMPONENTatmos=${COMPONENTatmos:-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}/${COMPONENTatmos}
 export gfsdir=${COMIN}
 export COMINgfs=${COMIN}
-export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}
+export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}
 
 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..8cba2a38f9 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 COMPONENTatmos=${COMPONENTatmos:-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}/${COMPONENTatmos}
 export COMINgfs=${COMIN}
 export gfsdir=${COMINgfs}
 export COMINgdas=${COMIN}
 export gdasdir=${COMINgdas}
-export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}
+export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}
 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..2577ddaa17 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 COMPONENTatmos=${COMPONENTatmos:-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}/${COMPONENTatmos}}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_FSU_GENESIS b/jobs/JGFS_FSU_GENESIS
index c66b3d1169..bf4849a5aa 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 COMPONENTatmos=${COMPONENTatmos:-atmos}
 
 
 ##############################################
@@ -93,13 +94,13 @@ 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}/${COMPONENTatmos}
 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}/${COMPONENTatmos}
 export COMINsyn=${COMINsyn:-$(compath.py arch/prod/syndat)}
 
 if [ $RUN_ENVIR = "nco" ]; then
diff --git a/jobs/JGFS_GEMPAK b/jobs/JGFS_GEMPAK
index 888b970a3f..9d6b6ddb42 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 COMPONENTatmos=${COMPONENTatmos:-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}/${COMPONENTatmos}}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}/gempak}
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/jobs/JGFS_GEMPAK_META b/jobs/JGFS_GEMPAK_META
index 45c6a0153d..fd8800aa56 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 COMPONENTatmos=${COMPONENTatmos:-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}/${COMPONENTatmos}/gempak}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}/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..58eebb606c 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 COMPONENTatmos=${COMPONENTatmos:-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}/${COMPONENTatmos}/gempak}
+export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/${COMPONENTatmos}}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
 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..113c6bd757 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 COMPONENTatmos=${COMPONENTatmos:-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}/${COMPONENTatmos}}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${NET}.${PDY}/${cyc}/${COMPONENTatmos}/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..967a29c94c 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 COMPONENTatmos=${COMPONENTatmos:-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}/${COMPONENTatmos}}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_POSTSND b/jobs/JGFS_POSTSND
index 0777eff655..4e542a4c18 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 COMPONENTatmos=${COMPONENTatmos:-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}/${COMPONENTatmos}}
+export COMOUT=${COMOUT:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
 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..b917f3f24b 100755
--- a/jobs/JGLOBAL_EMCSFC_SFC_PREP
+++ b/jobs/JGLOBAL_EMCSFC_SFC_PREP
@@ -39,13 +39,12 @@ GDATE=$($NDATE -06 $CDATE)
 PDY_m6hrs=$(echo $GDATE | cut -c1-8)
 cyc_m6hrs=$(echo $GDATE | cut -c9-10)
 export cycle_m6hrs=t${cyc_m6hrs}z
+export COMPONENTatmos=${COMPONENTatmos:-atmos}
 
-#### Lin Gan request for change
-#### export COMOUT=${COMROOT}/$NET/$envir/$RUN.$PDY/$cyc
-export COMOUT=${COMOUT:-${COMROOT}/$NET/$envir/$RUN.$PDY/$cyc}
+export COMOUT=${COMOUT:-${COMROOT}/$NET/$envir/$RUN.$PDY/$cyc/${COMPONENTatmos}}
 
-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/${COMPONENTatmos}}
+export COMINgfs_m6hrs=${COMINgfs_m6hrs:-$(compath.py $NET/$envir/$RUN.$PDY_m6hrs)/$cyc_m6hrs/${COMPONENTatmos}} 
 
 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 be694dcf34..6b67fab853 100755
--- a/jobs/JGLOBAL_FORECAST
+++ b/jobs/JGLOBAL_FORECAST
@@ -65,17 +65,18 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gfs"}}
+export COMPONENTatmos=${COMPONENTatmos:-"atmos"}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
     export RSTDIR=${GESROOT:?}/$envir
 fi
 
-# Source additional configs
+# Set wave variables
 if [ ${DO_WAVE:-"NO"} = "YES" ]; then
-# WAVE component directory
-  export WAV_MOD_ID=${WAV_MOD_ID:-wave}
-  export COMINWW3=${COMINWW3:-${ROTDIR:?}}
-  export COMOUTWW3=${COMOUTWW3:-${ROTDIR:?}}
+  # WAVE component directory
+  export COMPONENTwave=${COMPONENTwave:-"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 95fd4fb5ae..e69af38072 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 COMPONENTatmos=${COMPONENTatmos:-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}/${COMPONENTatmos}
+export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}
 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/JWAVE_INIT
index 70cb2fd8b0..e340619b90 100755
--- a/jobs/JWAVE_INIT
+++ b/jobs/JWAVE_INIT
@@ -27,7 +27,8 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
+export COMPONENTatmos=${COMPONENTatmos:-atmos}
+export COMPONENTwave=${COMPONENTwave:-wave}
 
 export HOMEgfs=${HOMEgfs:-$NWROOT/${NET}.${gfs_ver}}
 
@@ -67,10 +68,8 @@ export EXECwave=${EXECwave:-$HOMEgfs/exec}
 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}/${COMPONENTwave}}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTwave}}
 [[ ! -d $COMOUT ]] && mkdir -m 775 -p $COMOUT
 
 if [ $SENDCOM = YES ]; then
diff --git a/jobs/JWAVE_POST_SBS b/jobs/JWAVE_POST_SBS
index bca6a0cb6a..4853961d2d 100755
--- a/jobs/JWAVE_POST_SBS
+++ b/jobs/JWAVE_POST_SBS
@@ -27,7 +27,8 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
+export COMPONENTatmos=${COMPONENTatmos:-atmos}
+export COMPONENTwave=${COMPONENTwave:-wave}
 
 export HOMEgefs=${HOMEgefs:-$NWROOT/$NET.${gefs_ver}}
 export HOMEgfs=${HOMEgfs:-$NWROOT/$NET.${gfs_ver}}
@@ -68,10 +69,8 @@ export EXECwave=${EXECwave:-$HOMEgfs/exec}
 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}/${COMPONENTwave}}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTwave}}
 
 export COMINice=${COMINice:-${COMROOTp2}/omb/prod}
 export COMINwnd=${COMINwnd:-${COMROOT}/gfs/prod}
@@ -94,7 +93,7 @@ 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
 
diff --git a/jobs/JWAVE_PREP b/jobs/JWAVE_PREP
index ba821d2ee2..ea1be9b529 100755
--- a/jobs/JWAVE_PREP
+++ b/jobs/JWAVE_PREP
@@ -27,7 +27,8 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
+export COMPONENTatmos=${COMPONENTatmos:-atmos}
+export COMPONENTwave=${COMPONENTwave:-wave}
 
 export HOMEgfs=${HOMEgfs:-$NWROOT/gfs.${gfs_ver}}
 
@@ -72,15 +73,13 @@ export EXECwave=${EXECwave:-$HOMEgfs/exec}
 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}/${COMPONENTwave}}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTwave}}
 [[ ! -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}/${COMPONENTatmos}
+  export COMIN_WAV_WND=${COMIN_WAV_WND:-$(compath.py gfs/prod)}/${CDUMP}.${PDY}/${cyc}/${COMPONENTatmos}
   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 +90,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}/${COMPONENTatmos}/${WAVICEFILE} ]; then # Check if symlink already exists in ROTDIR
+    $NLN $DMPDIR/$CDUMP.${PDY}/$cyc/${WAVICEFILE} $ROTDIR/$CDUMP.${PDY}/$cyc/${COMPONENTatmos}/${WAVICEFILE}
   fi
-  export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc}
+  export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/${COMPONENTatmos}}
   export COMIN_WAV_ICE=${COMIN_OBS}
   export COMIN_WAV_WND=${COMIN_OBS}
   export COMIN_WAV_CUR=${ROTDIR}/${WAVECUR_DID}.${RPDY}
@@ -106,7 +105,7 @@ 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}
+export WAV_MOD_TAG=${CDUMP}wave${waveMEMB}
 
 # Execute the Script  
 $HOMEwave/scripts/exwave_prep.sh
diff --git a/jobs/rocoto/arch.sh b/jobs/rocoto/arch.sh
index 68286fee57..13658b8a62 100755
--- a/jobs/rocoto/arch.sh
+++ b/jobs/rocoto/arch.sh
@@ -44,6 +44,8 @@ else
    format="nemsio"
 fi
 
+COMPONENTatmos=${COMPONENTatmos:-"atmos"}
+
 # Realtime parallels run GFS MOS on 1 day delay
 # If realtime parallel, back up CDATE_MOS one day
 CDATE_MOS=$CDATE
@@ -56,7 +58,7 @@ PDY_MOS=$(echo $CDATE_MOS | cut -c1-8)
 # Archive online for verification and diagnostics
 ###############################################################
 
-COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
+COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/${COMPONENTatmos}"
 cd $COMIN
 
 [[ ! -d $ARCDIR ]] && mkdir -p $ARCDIR
@@ -303,8 +305,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/${COMPONENTatmos}"
+    COMINwave="$ROTDIR/${CDUMP}.$gPDY/$gcyc/${COMPONENTwave}"
     COMINrtofs="$ROTDIR/rtofs.$gPDY"
     if [ -d $COMIN ]; then
         rocotolog="$EXPDIR/logs/${GDATE}.log"
@@ -329,12 +331,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..ef3f4d9109 100755
--- a/jobs/rocoto/awips.sh
+++ b/jobs/rocoto/awips.sh
@@ -43,7 +43,7 @@ status=$?
 export CDATEm1=$($NDATE -24 $CDATE)
 export PDYm1=$(echo $CDATEm1 | cut -c1-8)
 
-export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/${COMPONENTatmos}"
 export DATAROOT="$RUNDIR/$CDATE/$CDUMP/awips$FHRGRP"
 [[ -d $DATAROOT ]] && rm -rf $DATAROOT
 mkdir -p $DATAROOT
@@ -53,7 +53,7 @@ mkdir -p $DATAROOT
 echo
 echo "=============== BEGIN AWIPS ==============="
 export SENDCOM="YES"
-export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/${COMPONENTatmos}"
 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..272c479c3d 100755
--- a/jobs/rocoto/earc.sh
+++ b/jobs/rocoto/earc.sh
@@ -40,7 +40,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/${COMPONENTatmos}/earc$ENSGRP"
 [[ -d $ARCH_LIST ]] && rm -rf $ARCH_LIST
 mkdir -p $ARCH_LIST
 cd $ARCH_LIST
@@ -130,12 +130,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/${COMPONENTatmos}/${CDUMP}.t${cyc}z.enkfstat         enkfstat.${CDUMP}.$CDATE
+    $NCP $ROTDIR/enkf${CDUMP}.$PDY/$cyc/${COMPONENTatmos}/${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/${COMPONENTatmos}/${CDUMP}.t${cyc}z.enkfstat         enkfstat.gfs.$CDATE
+		$NCP $ROTDIR/enkfgfs.$PDY/$cyc/${COMPONENTatmos}/${CDUMP}.t${cyc}z.gsistat.ensmean  gsistat.gfs.${CDATE}.ensmean
 	fi
 
 fi
@@ -159,10 +159,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/${COMPONENTatmos}"
     [[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS
-    COMIN_ENS="$ROTDIR/enkfgfs.$gPDY/$gcyc"
+    COMIN_ENS="$ROTDIR/enkfgfs.$gPDY/$gcyc/${COMPONENTatmos}"
     [[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS
 
     # PREVIOUS day 00Z remove the whole day
@@ -170,7 +170,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..e829786f43 100755
--- a/jobs/rocoto/fv3ic.sh
+++ b/jobs/rocoto/fv3ic.sh
@@ -55,7 +55,7 @@ if [ $status -ne 0 ]; then
 fi
 
 # Stage the FV3 initial conditions to ROTDIR
-COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
+COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/${COMPONENTatmos}"
 [[ ! -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..da69e02465 100755
--- a/jobs/rocoto/gempak.sh
+++ b/jobs/rocoto/gempak.sh
@@ -42,7 +42,7 @@ status=$?
 export CDATEm1=$($NDATE -24 $CDATE)
 export PDYm1=$(echo $CDATEm1 | cut -c1-8)
 
-export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/${COMPONENTatmos}"
 export DATAROOT="$RUNDIR/$CDATE/$CDUMP/gempak"
 [[ -d $DATAROOT ]] && rm -rf $DATAROOT
 mkdir -p $DATAROOT
@@ -55,7 +55,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/${COMPONENTatmos}/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..967c85e847 100755
--- a/jobs/rocoto/getic.sh
+++ b/jobs/rocoto/getic.sh
@@ -187,7 +187,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/${COMPONENTatmos}
   [[ ! -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..4694796fdb 100755
--- a/jobs/rocoto/metp.sh
+++ b/jobs/rocoto/metp.sh
@@ -43,7 +43,7 @@ status=$?
 export CDATEm1=$($NDATE -24 $CDATE)
 export PDYm1=$(echo $CDATEm1 | cut -c1-8)
 
-export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/${COMPONENTatmos}"
 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..7722042df5 100755
--- a/jobs/rocoto/post.sh
+++ b/jobs/rocoto/post.sh
@@ -11,13 +11,14 @@
 status=$?
 [[ $status -ne 0 ]] && exit $status
 
+COMPONENTatmos=${COMPONENTatmos:-"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}/${COMPONENTatmos}/${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}/${COMPONENTatmos}/${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}/${COMPONENTatmos}/${CDUMP}.t${cyc}z.master.grb2f${fhr}
+    pgb0p25=$ROTDIR/${CDUMP}.${PDY}/${cyc}/${COMPONENTatmos}/${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..625518fa97 100755
--- a/jobs/rocoto/postsnd.sh
+++ b/jobs/rocoto/postsnd.sh
@@ -42,7 +42,7 @@ status=$?
 export CDATEm1=$($NDATE -24 $CDATE)
 export PDYm1=$(echo $CDATEm1 | cut -c1-8)
 
-export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/${COMPONENTatmos}"
 export DATAROOT="$RUNDIR/$CDATE/$CDUMP/postsnd"
 [[ -d $DATAROOT ]] && rm -rf $DATAROOT
 mkdir -p $DATAROOT
@@ -57,7 +57,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/${COMPONENTatmos}"
 export pcom="$COMOUT/wmo"
 export COMAWP="$COMOUT/gempak"
 
diff --git a/jobs/rocoto/prep.sh b/jobs/rocoto/prep.sh
index 8e8037ebd6..df6c83be9c 100755
--- a/jobs/rocoto/prep.sh
+++ b/jobs/rocoto/prep.sh
@@ -24,7 +24,7 @@ status=$?
 ###############################################################
 # Set script and dependency variables
 export OPREFIX="${CDUMP}.t${cyc}z."
-export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/${COMPONENTatmos}"
 [[ ! -d $COMOUT ]] && mkdir -p $COMOUT
 
 ###############################################################
@@ -39,7 +39,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/${COMPONENTatmos}"
    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=$?
@@ -94,9 +94,9 @@ if [ $DO_MAKEPREPBUFR = "YES" ]; then
       COMIN_OBS=${COMIN_OBS:-$DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}}
       export COMSP=${COMSP:-$COMIN_OBS/$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}
+    export COMIN=${COMIN:-$ROTDIR/$CDUMP.$PDY/$cyc/${COMPONENTatmos}}
+    export COMINgdas=${COMINgdas:-$ROTDIR/gdas.$PDY/$cyc/${COMPONENTatmos}}
+    export COMINgfs=${COMINgfs:-$ROTDIR/gfs.$PDY/$cyc/${COMPONENTatmos}}
 
     $HOMEobsproc_network/jobs/JGLOBAL_PREP
     status=$?
diff --git a/jobs/rocoto/vrfy.sh b/jobs/rocoto/vrfy.sh
index 0c077c8152..be51dffceb 100755
--- a/jobs/rocoto/vrfy.sh
+++ b/jobs/rocoto/vrfy.sh
@@ -42,7 +42,7 @@ status=$?
 export CDATEm1=$($NDATE -24 $CDATE)
 export PDYm1=$(echo $CDATEm1 | cut -c1-8)
 
-export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/${COMPONENTatmos}"
 export DATAROOT="$RUNDIR/$CDATE/$CDUMP/vrfy"
 [[ -d $DATAROOT ]] && rm -rf $DATAROOT
 mkdir -p $DATAROOT
@@ -122,7 +122,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/${COMPONENTatmos}"
     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 +139,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/${COMPONENTatmos}"
     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 +155,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/${COMPONENTatmos}"
     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/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn
index 66bab5904b..d73aafd145 100755
--- a/parm/config/config.base.emc.dyn
+++ b/parm/config/config.base.emc.dyn
@@ -110,6 +110,8 @@ export ATARDIR="/NCEPDEV/$HPSS_PROJECT/1year/$USER/$machine/scratch/$PSLOT"
 export envir=${envir:-"prod"}
 export NET="gfs"
 export RUN=${RUN:-${CDUMP:-"gfs"}}
+export COMPONENTatmos="atmos"
+export COMPONENTwave="wave"
 export jlogfile="${EXPDIR}/logs/jlogfile"
 export ERRSCRIPT=${ERRSCRIPT:-'eval [[ $err = 0 ]]'}
 export LOGSCRIPT=${LOGSCRIPT:-""}
diff --git a/parm/config/config.fcst b/parm/config/config.fcst
index 68f5c754cd..fff848787b 100755
--- a/parm/config/config.fcst
+++ b/parm/config/config.fcst
@@ -15,6 +15,7 @@ if [ $DONST = "YES" ]; then
     . $EXPDIR/config.nsst
 fi
 
+export COMPONENTatmos=${COMPONENTatmos:-"atmos"}
 export FORECASTSH="$HOMEgfs/scripts/exglobal_fcst_nemsfv3gfs.sh"
 export FCSTEXECDIR="$HOMEgfs/exec"
 export FCSTEXEC="global_fv3gfs.x"
diff --git a/parm/config/config.wave b/parm/config/config.wave
index 9980c4748f..03ffa7a13f 100755
--- a/parm/config/config.wave
+++ b/parm/config/config.wave
@@ -13,14 +13,16 @@ 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}/${COMPONENTwave}
+export COMOUTwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTwave}
+
 # 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 COMPONENTwave="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
diff --git a/scripts/exglobal_fcst_nemsfv3gfs.sh b/scripts/exglobal_fcst_nemsfv3gfs.sh
index 6f60bbc51d..cb0447045e 100755
--- a/scripts/exglobal_fcst_nemsfv3gfs.sh
+++ b/scripts/exglobal_fcst_nemsfv3gfs.sh
@@ -40,6 +40,9 @@ 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}
 CDUMP=${CDUMP:-gdas}
@@ -149,7 +152,7 @@ fi
 cd $DATA || exit 8
 mkdir -p $DATA/INPUT
 if [ $CDUMP = "gfs" -a $rst_invt1 -gt 0 ]; then
-    RSTDIR_TMP=${RSTDIR:-$ROTDIR}/${CDUMP}.${PDY}/${cyc}/RERUN_RESTART
+    RSTDIR_TMP=${RSTDIR:-$ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTatmos}/RERUN_RESTART
     if [ ! -d $RSTDIR_TMP ]; then mkdir -p $RSTDIR_TMP ; fi
     $NLN $RSTDIR_TMP RESTART
 else
@@ -191,13 +194,13 @@ else
   rprefix=enkf$rCDUMP
   memchar=mem$(printf %03i $MEMBER)
 fi
-memdir=$ROTDIR/${prefix}.$PDY/$cyc/$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/$memchar
+gmemdir=$ROTDIR/${rprefix}.$gPDY/$gcyc/$COMPONENTatmos/$memchar
 sCDATE=$($NDATE -3 $CDATE)
 
 if [[ "$DOIAU" = "YES" ]]; then
@@ -397,35 +400,40 @@ fi
 
 #### Copy over WW3 inputs
 if [ $cplwav = ".true." ]; then
-# Link WW3 files
-  for file in $(ls $COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/rmp_src_to_dst_conserv_*) ; do
+
+  # Link WW3 files
+  for file in $(ls $COMINwave/rundata/rmp_src_to_dst_conserv_*) ; do
     $NLN $file $DATA/
   done
-  $NLN $COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/ww3_multi.${COMPONENTwave}${WAV_MEMBER}.${cycle}.inp $DATA/ww3_multi.inp
-        # Check for expected wave grids for this run
+  $NLN $COMINwave/rundata/ww3_multi.${CDUMPwave}${WAV_MEMBER}.${cycle}.inp $DATA/ww3_multi.inp
+
+  # Check for expected wave grids for this run
   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
     # Wave IC (restart) file must exist for warm start on this cycle, if not wave model starts from flat ocean
     # For IAU needs to use sPDY for adding IAU backup of 3h
-    $NLN $COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/${COMPONENTwave}.mod_def.$wavGRD $DATA/mod_def.$wavGRD
+    $NLN $COMINwave/rundata/${CDUMPwave}.mod_def.$wavGRD $DATA/mod_def.$wavGRD
   done
+
   # Wave IC (restart) interval assumes 4 daily cycles (restarts only written by gdas cycle) 
   # WAVHCYC needs to be consistent with restart write interval in ww3_multi.inp or will FAIL
-  WAVHCYC=${WAVHCYC:-6}
-  WRDATE=`$NDATE -${WAVHCYC} $CDATE`
-  WRPDY=`echo $WRDATE | cut -c1-8`
-  WRcyc=`echo $WRDATE | cut -c9-10`
-  WRDIR=$COMINWW3/${COMPONENTRSTwave}.${WRPDY}/${WRcyc}/restart
-  datwave=$COMOUTWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/
-  wavprfx=${COMPONENTwave}${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}/${COMPONENTwave}/restart
+  export datwave=$COMOUTwave/rundata
+  export wavprfx=${CDUMP}${WAV_MEMBER}
   for wavGRD in $waveGRD ; do
     # Link wave IC for current cycle
     $NLN ${WRDIR}/${sPDY}.${scyc}0000.restart.${wavGRD} $DATA/restart.${wavGRD}
     eval $NLN $datwave/${wavprfx}.log.${wavGRD}.${PDY}${cyc} log.${wavGRD}
   done
+
   if [ "$WW3ICEINP" = "YES" ]; then
-    wavicefile=$COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/${COMPONENTwave}.${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!"
@@ -433,8 +441,9 @@ if [ $cplwav = ".true." ]; then
     fi
     $NLN ${wavicefile} $DATA/ice.${WAVEICE_FID}
   fi
+
   if [ "$WW3CURINP" = "YES" ]; then
-    wavcurfile=$COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/${COMPONENTwave}.${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!"
@@ -442,10 +451,12 @@ if [ $cplwav = ".true." ]; then
     fi
     $NLN $wavcurfile $DATA/current.${WAVECUR_FID}
   fi
-# Link output files
+
+  # Link output files
   cd $DATA
   eval $NLN $datwave/${wavprfx}.log.mww3.${PDY}${cyc} log.mww3
-# Loop for gridded output (uses FHINC)
+
+  # Loop for gridded output (uses FHINC)
   fhr=$FHMIN_WAV
   while [ $fhr -le $FHMAX_WAV ]; do
     YMDH=`$NDATE $fhr $CDATE`
@@ -460,7 +471,8 @@ if [ $cplwav = ".true." ]; then
       fi
     fhr=$((fhr+FHINC))
   done
-# Loop for point output (uses DTPNT)
+
+  # Loop for point output (uses DTPNT)
   fhr=$FHMIN_WAV
   while [ $fhr -le $FHMAX_WAV ]; do
     YMDH=`$NDATE $fhr $CDATE`
@@ -470,7 +482,8 @@ if [ $cplwav = ".true." ]; then
       FHINC=$FHINCP_WAV
     fhr=$((fhr+FHINC))
   done
-fi
+
+fi #cplwav=true
 
 # inline post fix files
 if [ $WRITE_DOPOST = ".true." ]; then
@@ -1304,7 +1317,7 @@ if [ $SEND = "YES" ]; then
          $NCP $file $memdir/RESTART/$file
        done
        if [ $cplwav = ".true." ]; then
-         WRDIR=$COMOUTWW3/${COMPONENTRSTwave}.${PDY}/${cyc}/restart
+         WRDIR=$COMOUTwave/restart
          mkdir -p ${WRDIR}
          for wavGRD in $waveGRD ; do
          # Copy wave IC for the next cycle
@@ -1326,7 +1339,7 @@ if [ $SEND = "YES" ]; then
          $NCP $file $memdir/RESTART/$file
       done
       if [ $cplwav = ".true." ]; then
-        WRDIR=$COMOUTWW3/${COMPONENTRSTwave}.${PDY}/${cyc}/restart/
+        WRDIR=$COMOUTwave/restart
         mkdir -p ${WRDIR}
         for wavGRD in $waveGRD ; do
         # Copy wave IC for the next cycle
diff --git a/scripts/exwave_init.sh b/scripts/exwave_init.sh
index 714ed7880b..0183c5bfa9 100755
--- a/scripts/exwave_init.sh
+++ b/scripts/exwave_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/exwave_post_sbs.sh
index a836fa85f9..a678d3e5ac 100755
--- a/scripts/exwave_post_sbs.sh
+++ b/scripts/exwave_post_sbs.sh
@@ -138,13 +138,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/exwave_prep.sh
index d687600b1a..77f860f8f7 100755
--- a/scripts/exwave_prep.sh
+++ b/scripts/exwave_prep.sh
@@ -66,8 +66,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 +76,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 +100,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 +116,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 +141,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 +158,7 @@
   echo ' '
   [[ "$LOUD" = YES ]] && set -x
 
-# 1.a Model definition files
+  # 1.a Model definition files
 
   rm -f cmdfile
   touch cmdfile
@@ -172,12 +172,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 +195,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 +750,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/ush/drive_makeprepbufr.sh b/ush/drive_makeprepbufr.sh
index c886b25f75..adddc813de 100755
--- a/ush/drive_makeprepbufr.sh
+++ b/ush/drive_makeprepbufr.sh
@@ -53,9 +53,11 @@ GSUFFIX=${GSUFFIX:-$SUFFIX}
 APREFIX="${CDUMP}.t${chh}z."
 ASUFFIX=${ASUFFIX:-$SUFFIX}
 
+COMPONENTatmos=${COMPONENTatmos:-atmos}
+
 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/$COMPONENTatmos"}
+COMOUT=${COMOUT:-"$ROTDIR/$CDUMP.$cymd/$chh/$COMPONENTatmos"}
 [[ ! -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..49fd5fa147 100755
--- a/ush/getdump.sh
+++ b/ush/getdump.sh
@@ -4,7 +4,7 @@ set -x
 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/$COMPONENTatmos}
 
 DUMP_SUFFIX=${DUMP_SUFFIX:-""}
 
diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh
index e00c293f2e..49312aebea 100755
--- a/ush/hpssarch_gen.sh
+++ b/ush/hpssarch_gen.sh
@@ -12,6 +12,8 @@ type=${1:-gfs}                ##gfs, gdas, enkfgdas or enkfggfs
 CDATE=${CDATE:-2018010100}
 PDY=$(echo $CDATE | cut -c 1-8)
 cyc=$(echo $CDATE | cut -c 9-10)
+COMPONENTatmos=${COMPONENTatmos:-atmos}
+COMPONENTwave=${COMPONENTwave:-wave}
 OUTPUT_FILE=${OUTPUT_FILE:-"netcdf"}
 OUTPUT_HISTORY=${OUTPUT_HISTORY:-".true."}
 SUFFIX=${SUFFIX:-".nc"}
@@ -46,7 +48,7 @@ if [ $type = "gfs" ]; then
   touch gfs_${format}b.txt
   touch gfs_restarta.txt
 
-  dirpath="gfs.${PDY}/${cyc}/"
+  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="gfswave.${PDY}/${cyc}/"
+    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}/"
+  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="gdaswave.${PDY}/${cyc}/"
+    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}/"
+  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}/mem${mem}/"
+    dirpath="enkf${CDUMP}.${PDY}/${cyc}/${COMPONENTatmos}/mem${mem}/"
     dirname="./${dirpath}"
     head="${CDUMP}.t${cyc}z."
 
diff --git a/ush/rocoto/setup_expt_fcstonly.py b/ush/rocoto/setup_expt_fcstonly.py
index 79d6fa9ed8..d54c7c6ec0 100755
--- a/ush/rocoto/setup_expt_fcstonly.py
+++ b/ush/rocoto/setup_expt_fcstonly.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/uve
+sr/bin/env python
 
 ###############################################################
 # < next few lines under version control, D O  N O T  E D I T >
diff --git a/ush/rocoto/setup_workflow.py b/ush/rocoto/setup_workflow.py
index b0559e4bed..7d169efa55 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)
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..cf80816e71 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 ' '
@@ -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