diff --git a/jobs/JGDAS_GEMPAK b/jobs/JGDAS_GEMPAK
index a015da25e0..7c76eed951 100755
--- a/jobs/JGDAS_GEMPAK
+++ b/jobs/JGDAS_GEMPAK
@@ -56,13 +56,12 @@ 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/$COMPONENTatmos}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENTatmos/gempak}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/atmos}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/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 7d9358eda0..91463d6ab6 100755
--- a/jobs/JGDAS_GEMPAK_META_NCDC
+++ b/jobs/JGDAS_GEMPAK_META_NCDC
@@ -50,7 +50,6 @@ 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
@@ -66,10 +65,10 @@ export DBN_ALERT_TYPE=GDAS_METAFILE
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/${COMPONENTatmos}/gempak}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/atmos/gempak}
 export COMINgdas=${COMINgdas:-$(compath.py ${NET}/${envir}/${RUN})}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}/gempak/meta}
-export COMOUTncdc=${COMOUTncdc:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak/meta}
+export COMOUTncdc=${COMOUTncdc:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
 
 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 3b703e6f79..950f263ed2 100755
--- a/jobs/JGFS_AWIPS_20KM_1P0DEG
+++ b/jobs/JGFS_AWIPS_20KM_1P0DEG
@@ -44,13 +44,12 @@ 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}/${COMPONENTatmos}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/atmos}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_AWIPS_G2 b/jobs/JGFS_AWIPS_G2
index f8f19cdc09..8a325ba282 100755
--- a/jobs/JGFS_AWIPS_G2
+++ b/jobs/JGFS_AWIPS_G2
@@ -45,13 +45,12 @@ 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}/${COMPONENTatmos}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/atmos}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_CYCLONE_GENESIS b/jobs/JGFS_CYCLONE_GENESIS
index eef461455a..9e0251de45 100755
--- a/jobs/JGFS_CYCLONE_GENESIS
+++ b/jobs/JGFS_CYCLONE_GENESIS
@@ -53,7 +53,6 @@ setpdy.sh
 ####################################
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTatmos=${COMPONENTatmos:-atmos}
 
 ##############################################
 # Determine Job Output Name on System
@@ -91,10 +90,10 @@ export SCRIPTens_tracker=${SCRIPTens_tracker:-$HOMEens_tracker/scripts}
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}
+export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos
 export gfsdir=${COMIN}
 export COMINgfs=${COMIN}
-export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}
+export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos
 
 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 8cba2a38f9..6b234b1a0c 100755
--- a/jobs/JGFS_CYCLONE_TRACKER
+++ b/jobs/JGFS_CYCLONE_TRACKER
@@ -53,7 +53,6 @@ setpdy.sh
 ####################################
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTatmos=${COMPONENTatmos:-atmos}
 
 
 ##############################################
@@ -93,12 +92,12 @@ export USHens_tracker=${USHens_tracker:-$HOMEens_tracker/ush}
 ##############################################
 # Define COM and Data directories
 ##############################################
-export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}
+export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos
 export COMINgfs=${COMIN}
 export gfsdir=${COMINgfs}
 export COMINgdas=${COMIN}
 export gdasdir=${COMINgdas}
-export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}
+export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos
 export COMINsyn=${COMINsyn:-$(compath.py arch/prod/syndat)}
 
 if [ $RUN_ENVIR = "nco" ]; then
diff --git a/jobs/JGFS_FBWIND b/jobs/JGFS_FBWIND
index 2577ddaa17..5928837e1c 100755
--- a/jobs/JGFS_FBWIND
+++ b/jobs/JGFS_FBWIND
@@ -44,13 +44,12 @@ 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}/${COMPONENTatmos}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/atmos}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_FSU_GENESIS b/jobs/JGFS_FSU_GENESIS
index bf4849a5aa..806c7fd3c2 100755
--- a/jobs/JGFS_FSU_GENESIS
+++ b/jobs/JGFS_FSU_GENESIS
@@ -54,7 +54,6 @@ setpdy.sh
 ####################################
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTatmos=${COMPONENTatmos:-atmos}
 
 
 ##############################################
@@ -94,13 +93,13 @@ export USHens_tracker=${USHens_tracker:-$HOMEens_tracker/ush}
 ##############################################
 # Define COM and Data directories
 ##############################################
-export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}
+export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos
 export COMINgfs=${COMIN}
 #export gfsdir=${COMINgfs}
 export gfsdir=${ROTDIR}
 export COMINgdas=${COMIN}
 export gdasdir=${COMINgdas}
-export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}
+export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos
 export COMINsyn=${COMINsyn:-$(compath.py arch/prod/syndat)}
 
 if [ $RUN_ENVIR = "nco" ]; then
diff --git a/jobs/JGFS_GEMPAK b/jobs/JGFS_GEMPAK
index 9d6b6ddb42..77301ceb52 100755
--- a/jobs/JGFS_GEMPAK
+++ b/jobs/JGFS_GEMPAK
@@ -56,13 +56,12 @@ 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}/${COMPONENTatmos}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}/gempak}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/atmos}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/gempak}
 
 if [ $SENDCOM = YES ] ; then
   mkdir -m 775 -p $COMOUT
diff --git a/jobs/JGFS_GEMPAK_META b/jobs/JGFS_GEMPAK_META
index fd8800aa56..7d12d7083b 100755
--- a/jobs/JGFS_GEMPAK_META
+++ b/jobs/JGFS_GEMPAK_META
@@ -62,7 +62,6 @@ 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
@@ -72,8 +71,8 @@ export DBN_ALERT_TYPE=GFS_METAFILE
 ##############################################
 # Define COM directories
 ##############################################
-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 COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/atmos/gempak}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos/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 58eebb606c..79fd63c61b 100755
--- a/jobs/JGFS_GEMPAK_NCDC_UPAPGIF
+++ b/jobs/JGFS_GEMPAK_NCDC_UPAPGIF
@@ -65,14 +65,13 @@ 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}/${COMPONENTatmos}/gempak}
-export COMINgfs=${COMINgfs:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/${COMPONENTatmos}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
+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 COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_PGRB2_SPEC_GEMPAK b/jobs/JGFS_PGRB2_SPEC_GEMPAK
index 113c6bd757..f260613311 100755
--- a/jobs/JGFS_PGRB2_SPEC_GEMPAK
+++ b/jobs/JGFS_PGRB2_SPEC_GEMPAK
@@ -45,7 +45,6 @@ export SRCgfs=${SRCgfs:-$HOMEgfs/scripts}
 ####################################
 export NET=gfs
 export RUN=gfs_goessim
-export COMPONENTatmos=${COMPONENTatmos:-atmos}
 export finc=3
 export model=gfs
 export EXT=""
@@ -53,8 +52,8 @@ export EXT=""
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}/${COMPONENTatmos}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${NET}.${PDY}/${cyc}/${COMPONENTatmos}/gempak}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${NET}.${PDY})/${cyc}/atmos}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${NET}.${PDY}/${cyc}/atmos/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 967a29c94c..29e522da4b 100755
--- a/jobs/JGFS_PGRB2_SPEC_NPOESS
+++ b/jobs/JGFS_PGRB2_SPEC_NPOESS
@@ -47,13 +47,12 @@ 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}/${COMPONENTatmos}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/atmos}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
 export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ] ; then
diff --git a/jobs/JGFS_POSTSND b/jobs/JGFS_POSTSND
index 4e542a4c18..32f81c2b50 100755
--- a/jobs/JGFS_POSTSND
+++ b/jobs/JGFS_POSTSND
@@ -34,7 +34,6 @@ 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
@@ -54,8 +53,8 @@ setpdy.sh
 ##############################
 # Define COM Directories
 ##############################
-export COMIN=${COMIN:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
-export COMOUT=${COMOUT:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}}
+export COMIN=${COMIN:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
+export COMOUT=${COMOUT:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}/atmos}
 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 b917f3f24b..7a786d3453 100755
--- a/jobs/JGLOBAL_EMCSFC_SFC_PREP
+++ b/jobs/JGLOBAL_EMCSFC_SFC_PREP
@@ -39,12 +39,11 @@ 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}
 
-export COMOUT=${COMOUT:-${COMROOT}/$NET/$envir/$RUN.$PDY/$cyc/${COMPONENTatmos}}
+export COMOUT=${COMOUT:-${COMROOT}/$NET/$envir/$RUN.$PDY/$cyc/atmos}
 
-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 COMINgfs=${COMINgfs:-$(compath.py $NET/$envir/$RUN.$PDY)/$cyc/atmos}
+export COMINgfs_m6hrs=${COMINgfs_m6hrs:-$(compath.py $NET/$envir/$RUN.$PDY_m6hrs)/$cyc_m6hrs/atmos} 
 
 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 b46c0e22e7..6f53551275 100755
--- a/jobs/JGLOBAL_FORECAST
+++ b/jobs/JGLOBAL_FORECAST
@@ -65,7 +65,6 @@ 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
@@ -74,10 +73,9 @@ fi
 # Set wave variables
 if [ ${DO_WAVE:-"NO"} = "YES" ]; then
   # WAVE component directory
-  export COMPONENTwave=${COMPONENTwave:-"wave"}
   export CDUMPwave=${CDUMPwave:-${CDUMP}wave}
-  export COMINwave=${COMINwave:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTwave}}
-  export COMOUTwave=${COMOUTwave:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTwave}}
+  export COMINwave=${COMINwave:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
+  export COMOUTwave=${COMOUTwave:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
 fi
 
 ##############################################
diff --git a/jobs/JGLOBAL_TROPCY_QC_RELOC b/jobs/JGLOBAL_TROPCY_QC_RELOC
index e69af38072..1896fa58da 100755
--- a/jobs/JGLOBAL_TROPCY_QC_RELOC
+++ b/jobs/JGLOBAL_TROPCY_QC_RELOC
@@ -57,7 +57,6 @@ 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
@@ -89,8 +88,8 @@ export TANK_TROPCY=${TANK_TROPCY:-${DCOMROOT}/prod}   # path to tropical cyclone
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}
-export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENTatmos}
+export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos
+export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos
 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 e340619b90..2f1ab90ff4 100755
--- a/jobs/JWAVE_INIT
+++ b/jobs/JWAVE_INIT
@@ -27,8 +27,6 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTatmos=${COMPONENTatmos:-atmos}
-export COMPONENTwave=${COMPONENTwave:-wave}
 
 export HOMEgfs=${HOMEgfs:-$NWROOT/${NET}.${gfs_ver}}
 
@@ -68,8 +66,8 @@ export EXECwave=${EXECwave:-$HOMEgfs/exec}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
-export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTwave}}
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTwave}}
+export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
 [[ ! -d $COMOUT ]] && mkdir -m 775 -p $COMOUT
 
 if [ $SENDCOM = YES ]; then
diff --git a/jobs/JWAVE_POST_SBS b/jobs/JWAVE_POST_SBS
index 4853961d2d..ae09c2de56 100755
--- a/jobs/JWAVE_POST_SBS
+++ b/jobs/JWAVE_POST_SBS
@@ -27,8 +27,6 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTatmos=${COMPONENTatmos:-atmos}
-export COMPONENTwave=${COMPONENTwave:-wave}
 
 export HOMEgefs=${HOMEgefs:-$NWROOT/$NET.${gefs_ver}}
 export HOMEgfs=${HOMEgfs:-$NWROOT/$NET.${gfs_ver}}
@@ -69,8 +67,8 @@ export EXECwave=${EXECwave:-$HOMEgfs/exec}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
-export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTwave}}
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTwave}}
+export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
 
 export COMINice=${COMINice:-${COMROOTp2}/omb/prod}
 export COMINwnd=${COMINwnd:-${COMROOT}/gfs/prod}
diff --git a/jobs/JWAVE_PREP b/jobs/JWAVE_PREP
index ea1be9b529..9bef636823 100755
--- a/jobs/JWAVE_PREP
+++ b/jobs/JWAVE_PREP
@@ -27,8 +27,6 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTatmos=${COMPONENTatmos:-atmos}
-export COMPONENTwave=${COMPONENTwave:-wave}
 
 export HOMEgfs=${HOMEgfs:-$NWROOT/gfs.${gfs_ver}}
 
@@ -73,13 +71,13 @@ export EXECwave=${EXECwave:-$HOMEgfs/exec}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
-export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTwave}}
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTwave}}
+export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave}
 [[ ! -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}/${COMPONENTatmos}
-  export COMIN_WAV_WND=${COMIN_WAV_WND:-$(compath.py gfs/prod)}/${CDUMP}.${PDY}/${cyc}/${COMPONENTatmos}
+  export COMIN_WAV_ICE=${COMIN_WAV_ICE:-$(compath.py gfs/prod)}/${CDUMP}.${PDY}/${cyc}/atmos
+  export COMIN_WAV_WND=${COMIN_WAV_WND:-$(compath.py gfs/prod)}/${CDUMP}.${PDY}/${cyc}/atmos
   export COMIN_WAV_CUR=${COMIN_WAV_CUR:-$(compath.py ${WAVECUR_DID}/prod)}/${WAVECUR_DID}.${RPDY}
   if [ ! -d $COMIN_WAV_CUR ]; then
     export RPDY=`$NDATE -24 ${PDY}00 | cut -c1-8`
@@ -90,10 +88,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}/${COMPONENTatmos}/${WAVICEFILE} ]; then # Check if symlink already exists in ROTDIR
-    $NLN $DMPDIR/$CDUMP.${PDY}/$cyc/${WAVICEFILE} $ROTDIR/$CDUMP.${PDY}/$cyc/${COMPONENTatmos}/${WAVICEFILE}
+  if [ ! -L $ROTDIR/${CDUMP}.${PDY}/${cyc}/atmos/${WAVICEFILE} ]; then # Check if symlink already exists in ROTDIR
+    $NLN $DMPDIR/$CDUMP.${PDY}/$cyc/${WAVICEFILE} $ROTDIR/$CDUMP.${PDY}/$cyc/atmos/${WAVICEFILE}
   fi
-  export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/${COMPONENTatmos}}
+  export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/atmos}
   export COMIN_WAV_ICE=${COMIN_OBS}
   export COMIN_WAV_WND=${COMIN_OBS}
   export COMIN_WAV_CUR=${ROTDIR}/${WAVECUR_DID}.${RPDY}
diff --git a/jobs/rocoto/arch.sh b/jobs/rocoto/arch.sh
index 13658b8a62..dd037e32bd 100755
--- a/jobs/rocoto/arch.sh
+++ b/jobs/rocoto/arch.sh
@@ -44,7 +44,6 @@ 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
@@ -58,7 +57,7 @@ PDY_MOS=$(echo $CDATE_MOS | cut -c1-8)
 # Archive online for verification and diagnostics
 ###############################################################
 
-COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/${COMPONENTatmos}"
+COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
 cd $COMIN
 
 [[ ! -d $ARCDIR ]] && mkdir -p $ARCDIR
@@ -305,8 +304,8 @@ RTOFS_DATE=$($NDATE -48 $CDATE)
 while [ $GDATE -le $GDATEEND ]; do
     gPDY=$(echo $GDATE | cut -c1-8)
     gcyc=$(echo $GDATE | cut -c9-10)
-    COMIN="$ROTDIR/$CDUMP.$gPDY/$gcyc/${COMPONENTatmos}"
-    COMINwave="$ROTDIR/${CDUMP}.$gPDY/$gcyc/${COMPONENTwave}"
+    COMIN="$ROTDIR/${CDUMP}.$gPDY/$gcyc/atmos"
+    COMINwave="$ROTDIR/${CDUMP}.$gPDY/$gcyc/wave"
     COMINrtofs="$ROTDIR/rtofs.$gPDY"
     if [ -d $COMIN ]; then
         rocotolog="$EXPDIR/logs/${GDATE}.log"
diff --git a/jobs/rocoto/awips.sh b/jobs/rocoto/awips.sh
index ef3f4d9109..1960a45a2f 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/${COMPONENTatmos}"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
 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/${COMPONENTatmos}"
+export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
 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 272c479c3d..13195fb36b 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/${COMPONENTatmos}/earc$ENSGRP"
+ARCH_LIST="$ROTDIR/enkf${CDUMP}.$PDY/$cyc/atmos/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/${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
+    $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
 
     if [ $CDUMP_ENKF != "GDAS" ]; then
-		$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
+		$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
 	fi
 
 fi
@@ -160,9 +160,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/${COMPONENTatmos}"
+    COMIN_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/atmos"
     [[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS
-    COMIN_ENS="$ROTDIR/enkfgfs.$gPDY/$gcyc/${COMPONENTatmos}"
+    COMIN_ENS="$ROTDIR/enkfgfs.$gPDY/$gcyc/atmos"
     [[ -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 e829786f43..6d952957b6 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/${COMPONENTatmos}"
+COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
 [[ ! -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 da69e02465..36fd51a70a 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/${COMPONENTatmos}"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
 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/${COMPONENTatmos}/gempak"
+export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/atmos/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 967c85e847..9a72f58e38 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/${COMPONENTatmos}
+  COMROT=$ROTDIR/${CDUMP}.$PDY/$cyc/atmos
   [[ ! -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 4694796fdb..c90aa134ea 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/${COMPONENTatmos}"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
 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 7722042df5..ccef979b39 100755
--- a/jobs/rocoto/post.sh
+++ b/jobs/rocoto/post.sh
@@ -11,14 +11,12 @@
 status=$?
 [[ $status -ne 0 ]] && exit $status
 
-COMPONENTatmos=${COMPONENTatmos:-"atmos"}
-
 if [ $FHRGRP -eq 0 ]; then
     fhrlst="anl"
-    restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/${COMPONENTatmos}/${CDUMP}.t${cyc}z.atm
+    restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/atmos/${CDUMP}.t${cyc}z.atm
 else
     fhrlst=$(echo $FHRLST | sed -e 's/_/ /g; s/f/ /g; s/,/ /g')
-    restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/${COMPONENTatmos}/${CDUMP}.t${cyc}z.logf
+    restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/atmos/${CDUMP}.t${cyc}z.logf
 fi
 
 
@@ -34,8 +32,8 @@ for fhr in $fhrlst; do
         continue
     fi
 
-    #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}
+    #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}
     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 625518fa97..191ce46cb8 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/${COMPONENTatmos}"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
 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/${COMPONENTatmos}"
+export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
 export pcom="$COMOUT/wmo"
 export COMAWP="$COMOUT/gempak"
 
diff --git a/jobs/rocoto/prep.sh b/jobs/rocoto/prep.sh
index df6c83be9c..0f4edf2be9 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/${COMPONENTatmos}"
+export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
 [[ ! -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/${COMPONENTatmos}"
+   gCOMOUT="$ROTDIR/$GDUMP.$gPDY/$gcyc/atmos"
    if [ ! -s $gCOMOUT/$GDUMP.t${gcyc}z.updated.status.tm00.bufr_d ]; then
      $HOMEgfs/ush/getdump.sh $GDATE $GDUMP $DMPDIR/${GDUMP}${DUMP_SUFFIX}.${gPDY}/${gcyc} $gCOMOUT
      status=$?
@@ -90,13 +90,16 @@ if [ $DO_MAKEPREPBUFR = "YES" ]; then
 
     export job="j${CDUMP}_prep_${cyc}"
     export DATAROOT="$RUNDIR/$CDATE/$CDUMP/prepbufr"
+    #export COMIN=${COMIN:-$ROTDIR/$CDUMP.$PDY/$cyc/atmos}
+    export COMIN=${COMIN:-$ROTDIR}
+    export COMINgdas=${COMINgdas:-$ROTDIR/gdas.$PDY/$cyc/atmos}
+    export COMINgfs=${COMINgfs:-$ROTDIR/gfs.$PDY/$cyc/atmos}
     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.}
     fi
-    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 be51dffceb..079a807fe5 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/${COMPONENTatmos}"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
 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/${COMPONENTatmos}"
+    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
     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/${COMPONENTatmos}"
+    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
     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/${COMPONENTatmos}"
+    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/atmos"
     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 d73aafd145..66bab5904b 100755
--- a/parm/config/config.base.emc.dyn
+++ b/parm/config/config.base.emc.dyn
@@ -110,8 +110,6 @@ 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 fff848787b..68f5c754cd 100755
--- a/parm/config/config.fcst
+++ b/parm/config/config.fcst
@@ -15,7 +15,6 @@ 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 a6e2fe4d32..c0ffcebc35 100755
--- a/parm/config/config.wave
+++ b/parm/config/config.wave
@@ -13,12 +13,10 @@ 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}
+export COMINwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave
+export COMOUTwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave
 
 # General runtime labels
-# COMPONENTwave stands for model component, in addition to NET/RUN for coupled systems
-export COMPONENTwave="wave"
 export CDUMPwave="${CDUMP}wave"
 
 # In GFS/GDAS, restart files are generated/read from gdas runs
diff --git a/scripts/exglobal_fcst_nemsfv3gfs.sh b/scripts/exglobal_fcst_nemsfv3gfs.sh
index fa35d0c07d..5b68578e78 100755
--- a/scripts/exglobal_fcst_nemsfv3gfs.sh
+++ b/scripts/exglobal_fcst_nemsfv3gfs.sh
@@ -40,8 +40,6 @@ 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}
@@ -163,7 +161,7 @@ if [ $cplwav = ".true." ]; then
 fi
 
 if [ $CDUMP = "gfs" -a $rst_invt1 -gt 0 ]; then
-    RSTDIR_ATM=${RSTDIR:-$ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENTatmos}/RERUN_RESTART
+    RSTDIR_ATM=${RSTDIR:-$ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos/RERUN_RESTART
     if [ ! -d $RSTDIR_ATM ]; then mkdir -p $RSTDIR_ATM ; fi
     $NLN $RSTDIR_ATM RESTART
 else
@@ -205,13 +203,13 @@ else
   rprefix=enkf$rCDUMP
   memchar=mem$(printf %03i $MEMBER)
 fi
-memdir=$ROTDIR/${prefix}.$PDY/$cyc/$COMPONENTatmos/$memchar
+memdir=$ROTDIR/${prefix}.$PDY/$cyc/atmos/$memchar
 if [ ! -d $memdir ]; then mkdir -p $memdir; fi
 
 GDATE=$($NDATE -$assim_freq $CDATE)
 gPDY=$(echo $GDATE | cut -c1-8)
 gcyc=$(echo $GDATE | cut -c9-10)
-gmemdir=$ROTDIR/${rprefix}.$gPDY/$gcyc/$COMPONENTatmos/$memchar
+gmemdir=$ROTDIR/${rprefix}.$gPDY/$gcyc/atmos/$memchar
 sCDATE=$($NDATE -3 $CDATE)
 
 if [[ "$DOIAU" = "YES" ]]; then
@@ -436,7 +434,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}/${COMPONENTwave}/restart
+  export WRDIR=${ROTDIR}/${CDUMPRSTwave}.${WRPDY}/${WRcyc}/wave/restart
   export datwave=$COMOUTwave/rundata
   export wavprfx=${CDUMPwave}${WAV_MEMBER}
 
diff --git a/ush/drive_makeprepbufr.sh b/ush/drive_makeprepbufr.sh
index adddc813de..b0d934a6ff 100755
--- a/ush/drive_makeprepbufr.sh
+++ b/ush/drive_makeprepbufr.sh
@@ -53,11 +53,9 @@ 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/$COMPONENTatmos"}
-COMOUT=${COMOUT:-"$ROTDIR/$CDUMP.$cymd/$chh/$COMPONENTatmos"}
+COMIN_GES=${COMIN_GES:-"$ROTDIR/gdas.$gymd/$ghh/atmos"}
+COMOUT=${COMOUT:-"$ROTDIR/$CDUMP.$cymd/$chh/atmos"}
 [[ ! -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 49fd5fa147..fc5cec4e75 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/$COMPONENTatmos}
+TARGET_DIR=${4:-$ROTDIR/${CDUMP}.${PDY}/$cyc/atmos}
 
 DUMP_SUFFIX=${DUMP_SUFFIX:-""}
 
diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh
index 49312aebea..cdbf445ea4 100755
--- a/ush/hpssarch_gen.sh
+++ b/ush/hpssarch_gen.sh
@@ -12,8 +12,6 @@ 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"}
@@ -48,7 +46,7 @@ if [ $type = "gfs" ]; then
   touch gfs_${format}b.txt
   touch gfs_restarta.txt
 
-  dirpath="gfs.${PDY}/${cyc}/${COMPONENTatmos}"
+  dirpath="gfs.${PDY}/${cyc}/atmos"
   dirname="./${dirpath}"
 
   head="gfs.t${cyc}z."
@@ -150,7 +148,7 @@ if [ $type = "gfs" ]; then
     rm -rf gfswave.txt
     touch gfswave.txt
 
-    dirpath="gfs.${PDY}/${cyc}/${COMPONENTwave}"
+    dirpath="gfs.${PDY}/${cyc}/wave"
     dirname="./${dirpath}"
 
     head="gfswave.t${cyc}z."
@@ -178,7 +176,7 @@ if [ $type = "gdas" ]; then
   touch gdas_restarta.txt
   touch gdas_restartb.txt
 
-  dirpath="gdas.${PDY}/${cyc}/${COMPONENTatmos}"
+  dirpath="gdas.${PDY}/${cyc}/atmos"
   dirname="./${dirpath}"
   head="gdas.t${cyc}z."
 
@@ -275,7 +273,7 @@ if [ $type = "gdas" ]; then
     rm -rf gdaswave_restart.txt
     touch gdaswave_restart.txt
 
-    dirpath="gdas.${PDY}/${cyc}/${COMPONENTwave}"
+    dirpath="gdas.${PDY}/${cyc}/wave"
     dirname="./${dirpath}"
 
     head="gdaswave.t${cyc}z."
@@ -309,7 +307,7 @@ if [ $type = "enkfgdas" -o $type = "enkfgfs" ]; then
 ##NTARS2=$((NTARS/2))  # number of earc groups to include analysis/increments
   NTARS2=$NTARS
 
-  dirpath="enkf${CDUMP}.${PDY}/${cyc}/${COMPONENTatmos}"
+  dirpath="enkf${CDUMP}.${PDY}/${cyc}/atmos"
   dirname="./${dirpath}"
   head="${CDUMP}.t${cyc}z."
 
@@ -380,7 +378,7 @@ if [ $type = "enkfgdas" -o $type = "enkfgfs" ]; then
   while [ $m -le $NMEM_EARCGRP ]; do
     nm=$(((n-1)*NMEM_EARCGRP+m))
     mem=$(printf %03i $nm)
-    dirpath="enkf${CDUMP}.${PDY}/${cyc}/${COMPONENTatmos}/mem${mem}/"
+    dirpath="enkf${CDUMP}.${PDY}/${cyc}/atmos/mem${mem}/"
     dirname="./${dirpath}"
     head="${CDUMP}.t${cyc}z."
 
diff --git a/ush/wave_prnc_ice.sh b/ush/wave_prnc_ice.sh
index cf80816e71..254edc8b03 100755
--- a/ush/wave_prnc_ice.sh
+++ b/ush/wave_prnc_ice.sh
@@ -56,7 +56,7 @@
   if [ -z "$YMDH" ] || [ -z "$cycle" ] || \
      [ -z "$COMOUT" ] || [ -z "$FIXwave" ] || [ -z "$EXECwave" ] || \
      [ -z "$WAV_MOD_TAG" ] || [ -z "$WAVEICE_FID" ] || [ -z "$SENDCOM" ] || \
-     [ -z "$COMIN_WAV_ICE" ] || [ -z "$COMPONENTwave" ]
+     [ -z "$COMIN_WAV_ICE" ]
   then
     set $setoff
     echo ' '