diff --git a/jobs/JGDAS_ENKF_CHGRES b/jobs/JGDAS_ENKF_CHGRES
index c15e8cbfe..8bc1954ac 100755
--- a/jobs/JGDAS_ENKF_CHGRES
+++ b/jobs/JGDAS_ENKF_CHGRES
@@ -58,6 +58,7 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gfs"}}
+export COMPONENT=${COMPONENT:-atmos}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
@@ -81,22 +82,21 @@ export ASUFFIX=${ASUFFIX:-$SUFFIX}
 
 
 if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN=${COMIN:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMOUT=${COMOUT:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMOUT_ENS=${COMOUT_ENS:-$ROTDIR/enkfgdas.$PDY/$cyc}
-    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc}
+    export COMIN=${COMIN:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMOUT=${COMOUT:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMOUT_ENS=${COMOUT_ENS:-$ROTDIR/enkfgdas.$PDY/$cyc/$COMPONENT}
+    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
-    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
-    export COMOUT_ENS="$ROTDIR/enkfgdas.$PDY/$cyc"
+    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMOUT_ENS="$ROTDIR/enkfgdas.$PDY/$cyc/$COMPONENT"
     export COMIN_OBS="$DMPDIR/$CDATE/$CDUMP"
     export COMIN_GES_OBS="$DMPDIR/$GDATE/$GDUMP"
 fi
 mkdir -m 775 -p $COMOUT
 # COMIN_GES and COMIN_GES_ENS are used in exglobal script
-# TO DO: Map NCO's directory into these variables
-export COMIN_GES="$ROTDIR/$GDUMP.$gPDY/$gcyc"
-export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc"
+export COMIN_GES="$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
+export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/$COMPONENT"
 
 ###############################################################
 # Run relevant exglobal script
diff --git a/jobs/JGDAS_ENKF_FCST b/jobs/JGDAS_ENKF_FCST
index 67bc685d7..36e4a6302 100755
--- a/jobs/JGDAS_ENKF_FCST
+++ b/jobs/JGDAS_ENKF_FCST
@@ -57,6 +57,7 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export COMPONENT=${COMPONENT:-atmos}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
@@ -69,8 +70,7 @@ fi
 export CASE=$CASE_ENKF
 
 # COMOUT is used in exglobal script
-# TO DO: Map NCO's directory into these variables
-export COMOUT="$ROTDIR/enkf$CDUMP.$PDY/$cyc"
+export COMOUT="$ROTDIR/enkf$CDUMP.$PDY/$cyc/$COMPONENT"
 
 
 # Forecast length for EnKF forecast
diff --git a/jobs/JGDAS_ENKF_POST b/jobs/JGDAS_ENKF_POST
index 55bb97ee1..e5ca8b8c0 100755
--- a/jobs/JGDAS_ENKF_POST
+++ b/jobs/JGDAS_ENKF_POST
@@ -57,6 +57,7 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export COMPONENT=${COMPONENT:-atmos}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
@@ -70,9 +71,8 @@ export GFS_NCIO=${GFS_NCIO:-"YES"}
 export PREFIX="${CDUMP}.t${cyc}z."
 
 # COMIN, COMOUT are used in exglobal script
-# TO DO: Map NCO's directory into these variables
-export COMIN="$ROTDIR/enkf$CDUMP.$PDY/$cyc"
-export COMOUT="$ROTDIR/enkf$CDUMP.$PDY/$cyc"
+export COMIN="$ROTDIR/enkf$CDUMP.$PDY/$cyc/$COMPONENT"
+export COMOUT="$ROTDIR/enkf$CDUMP.$PDY/$cyc/$COMPONENT"
 
 
 export LEVS=$((LEVS-1))
diff --git a/jobs/JGDAS_ENKF_RECENTER b/jobs/JGDAS_ENKF_RECENTER
index 01c2b9cbd..fefe3c590 100755
--- a/jobs/JGDAS_ENKF_RECENTER
+++ b/jobs/JGDAS_ENKF_RECENTER
@@ -57,6 +57,7 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export COMPONENT=${COMPONENT:-atmos}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
@@ -89,19 +90,18 @@ export GSUFFIX=${GSUFFIX:-$SUFFIX}
 export ASUFFIX=${ASUFFIX:-$SUFFIX}
 
 if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc}
+    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
     export COMIN_OBS="$DMPDIR/$CDATE/$CDUMP"
     export COMIN_GES_OBS="$DMPDIR/$GDATE/$GDUMP"
 fi
 
 # COMIN, COMIN_ENS and COMIN_GES_ENS are used in exglobal script
-# TO DO: Map NCO's directory into these variables
-export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
-export COMIN_ENS="$ROTDIR/enkf$CDUMP_ENKF.$PDY/$cyc"
-export COMOUT_ENS="$ROTDIR/enkf$CDUMP.$PDY/$cyc"
-export COMIN_GES_ENS="$ROTDIR/enkf$CDUMP.$gPDY/$gcyc"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+export COMIN_ENS="$ROTDIR/enkf$CDUMP_ENKF.$PDY/$cyc/$COMPONENT"
+export COMOUT_ENS="$ROTDIR/enkf$CDUMP.$PDY/$cyc/$COMPONENT"
+export COMIN_GES_ENS="$ROTDIR/enkf$CDUMP.$gPDY/$gcyc/$COMPONENT"
 
 
 ###############################################################
diff --git a/jobs/JGDAS_ENKF_SURFACE b/jobs/JGDAS_ENKF_SURFACE
index 1fe82bead..1869f1fc1 100755
--- a/jobs/JGDAS_ENKF_SURFACE
+++ b/jobs/JGDAS_ENKF_SURFACE
@@ -57,6 +57,7 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export COMPONENT=${COMPONENT:-atmos}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
@@ -89,19 +90,18 @@ export GSUFFIX=${GSUFFIX:-$SUFFIX}
 export ASUFFIX=${ASUFFIX:-$SUFFIX}
 
 if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc}
+    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
     export COMIN_OBS="$DMPDIR/$CDATE/$CDUMP"
     export COMIN_GES_OBS="$DMPDIR/$GDATE/$GDUMP"
 fi
 
 # COMIN, COMIN_ENS and COMIN_GES_ENS are used in exglobal script
-# TO DO: Map NCO's directory into these variables
-export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc"
-export COMIN_ENS="$ROTDIR/enkf$CDUMP_ENKF.$PDY/$cyc"
-export COMOUT_ENS="$ROTDIR/enkf$CDUMP.$PDY/$cyc"
-export COMIN_GES_ENS="$ROTDIR/enkf$CDUMP.$gPDY/$gcyc"
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+export COMIN_ENS="$ROTDIR/enkf$CDUMP_ENKF.$PDY/$cyc/$COMPONENT"
+export COMOUT_ENS="$ROTDIR/enkf$CDUMP.$PDY/$cyc/$COMPONENT"
+export COMIN_GES_ENS="$ROTDIR/enkf$CDUMP.$gPDY/$gcyc/$COMPONENT"
 
 
 ###############################################################
diff --git a/jobs/JGLOBAL_ANALCALC b/jobs/JGLOBAL_ANALCALC
index 94e524a0e..a56928229 100755
--- a/jobs/JGLOBAL_ANALCALC
+++ b/jobs/JGLOBAL_ANALCALC
@@ -58,6 +58,7 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gfs"}}
+export COMPONENT=${COMPONENT:-atmos}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
@@ -81,20 +82,19 @@ export ASUFFIX=${ASUFFIX:-$SUFFIX}
 
 
 if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN=${COMIN:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMOUT=${COMOUT:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc}
+    export COMIN=${COMIN:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMOUT=${COMOUT:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
-    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
+    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
     export COMIN_OBS="$DMPDIR/$CDATE/$CDUMP"
     export COMIN_GES_OBS="$DMPDIR/$GDATE/$GDUMP"
 fi
 mkdir -m 775 -p $COMOUT
 # COMIN_GES and COMIN_GES_ENS are used in exglobal script
-# TO DO: Map NCO's directory into these variables
-export COMIN_GES="$ROTDIR/$GDUMP.$gPDY/$gcyc"
-export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc"
+export COMIN_GES="$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
+export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/$COMPONENT"
 
 
 export ATMGES="$COMIN_GES/${GPREFIX}atmf006${GSUFFIX}"
diff --git a/jobs/JGLOBAL_ANALDIAG b/jobs/JGLOBAL_ANALDIAG
index 0dc227616..ffa864e89 100755
--- a/jobs/JGLOBAL_ANALDIAG
+++ b/jobs/JGLOBAL_ANALDIAG
@@ -58,6 +58,7 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gfs"}}
+export COMPONENT=${COMPONENT:-atmos}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
@@ -81,20 +82,19 @@ export ASUFFIX=${ASUFFIX:-$SUFFIX}
 
 
 if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN=${COMIN:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMOUT=${COMOUT:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc}
+    export COMIN=${COMIN:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMOUT=${COMOUT:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
-    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
+    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
     export COMIN_OBS="$DMPDIR/$CDATE/$CDUMP"
     export COMIN_GES_OBS="$DMPDIR/$GDATE/$GDUMP"
 fi
 mkdir -m 775 -p $COMOUT
 # COMIN_GES and COMIN_GES_ENS are used in exglobal script
-# TO DO: Map NCO's directory into these variables
-export COMIN_GES="$ROTDIR/$GDUMP.$gPDY/$gcyc"
-export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc"
+export COMIN_GES="$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
+export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/$COMPONENT"
 
 
 export ATMGES="$COMIN_GES/${GPREFIX}atmf006${GSUFFIX}"
diff --git a/jobs/JGLOBAL_ANALYSIS b/jobs/JGLOBAL_ANALYSIS
index 2933109c9..46b22acd9 100755
--- a/jobs/JGLOBAL_ANALYSIS
+++ b/jobs/JGLOBAL_ANALYSIS
@@ -58,6 +58,7 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gfs"}}
+export COMPONENT=${COMPONENT:-atmos}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
@@ -81,20 +82,19 @@ export ASUFFIX=${ASUFFIX:-$SUFFIX}
 
 
 if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN=${COMIN:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMOUT=${COMOUT:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc}
+    export COMIN=${COMIN:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMOUT=${COMOUT:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
-    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
+    export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
     export COMIN_OBS="$DMPDIR/$CDATE/$CDUMP"
     export COMIN_GES_OBS="$DMPDIR/$GDATE/$GDUMP"
 fi
 mkdir -m 775 -p $COMOUT
 # COMIN_GES and COMIN_GES_ENS are used in exglobal script
-# TO DO: Map NCO's directory into these variables
-export COMIN_GES="$ROTDIR/$GDUMP.$gPDY/$gcyc"
-export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc"
+export COMIN_GES="$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
+export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/$COMPONENT"
 
 
 export ATMGES="$COMIN_GES/${GPREFIX}atmf006${GSUFFIX}"
diff --git a/jobs/JGLOBAL_ENKF_ANALDIAG b/jobs/JGLOBAL_ENKF_ANALDIAG
index 6cc4dbd58..e83d0100a 100755
--- a/jobs/JGLOBAL_ENKF_ANALDIAG
+++ b/jobs/JGLOBAL_ENKF_ANALDIAG
@@ -57,6 +57,7 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export COMPONENT=${COMPONENT:-atmos}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
@@ -81,20 +82,19 @@ export GSUFFIX="${GSUFFIX:-".ensmean${SUFFIX}"}"
 export ASUFFIX="${ASUFFIX:-"${SUFFIX}"}"
 
 if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc}
+    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
     export COMIN_OBS="$DMPDIR/$CDATE/$CDUMP"
     export COMIN_GES_OBS="$DMPDIR/$GDATE/$GDUMP"
 fi
 
 # COMIN_GES, COMIN_ANL COMIN_GES_ENS, and COMOUT  are used in exglobal script
-# TO DO: Map NCO's directory into these variables
-COMIN_GES_CTL="$ROTDIR/gdas.$gPDY/$gcyc"
-export COMIN_ANL="$ROTDIR/$CDUMP.$PDY/$cyc"
-export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc"
+COMIN_GES_CTL="$ROTDIR/gdas.$gPDY/$gcyc/$COMPONENT"
+export COMIN_ANL="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/$COMPONENT"
 export COMIN_GES=$COMIN_GES_ENS
-export COMOUT="$ROTDIR/enkf$CDUMP.$PDY/$cyc"
+export COMOUT="$ROTDIR/enkf$CDUMP.$PDY/$cyc/$COMPONENT"
 
 
 export ATMGES_ENSMEAN="$COMIN_GES_ENS/${GPREFIX}atmf006$GSUFFIX"
diff --git a/jobs/JGLOBAL_ENKF_INNOVATE_OBS b/jobs/JGLOBAL_ENKF_INNOVATE_OBS
index 19ce53398..b53530fb5 100755
--- a/jobs/JGLOBAL_ENKF_INNOVATE_OBS
+++ b/jobs/JGLOBAL_ENKF_INNOVATE_OBS
@@ -57,6 +57,7 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export COMPONENT=${COMPONENT:-atmos}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
@@ -81,11 +82,10 @@ export ASUFFIX="${ASUFFIX:-$SUFFIX}"
 
 
 # COMIN_GES, COMIN_GES_ENS and COMOUT are used in exglobal script
-# TO DO: Map NCO's directory into these variables
-COMIN_GES_CTL="$ROTDIR/gdas.$gPDY/$gcyc"
-export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc"
+COMIN_GES_CTL="$ROTDIR/gdas.$gPDY/$gcyc/$COMPONENT"
+export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/$COMPONENT"
 export COMIN_GES=$COMIN_GES_ENS
-export COMOUT="$ROTDIR/enkf$CDUMP.$PDY/$cyc"
+export COMOUT="$ROTDIR/enkf$CDUMP.$PDY/$cyc/$COMPONENT"
 
 
 export ATMGES_ENSMEAN="$COMIN_GES_ENS/${GPREFIX}atmf006.ensmean$GSUFFIX"
@@ -132,7 +132,7 @@ status=$?
 
 
 # Double check the status of members in ENSGRP
-EOMGGRP=$ROTDIR/enkf${CDUMP}.$PDY/$cyc/eomg.grp${ENSGRP}
+EOMGGRP=$ROTDIR/enkf${CDUMP}.$PDY/$cyc/$COMPONENT/eomg.grp${ENSGRP}
 npass=0
 if [ -f $EOMGGRP ]; then
     npass=$(grep "PASS" $EOMGGRP | wc -l)
diff --git a/jobs/JGLOBAL_ENKF_SELECT_OBS b/jobs/JGLOBAL_ENKF_SELECT_OBS
index de69dd94b..e6a0e5855 100755
--- a/jobs/JGLOBAL_ENKF_SELECT_OBS
+++ b/jobs/JGLOBAL_ENKF_SELECT_OBS
@@ -57,6 +57,7 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export COMPONENT=${COMPONENT:-atmos}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
@@ -81,20 +82,19 @@ export GSUFFIX="${GSUFFIX:-".ensmean${SUFFIX}"}"
 export ASUFFIX="${ASUFFIX:-"${SUFFIX}"}"
 
 if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc}
-    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc}
+    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
     export COMIN_OBS="$DMPDIR/$CDATE/$CDUMP"
     export COMIN_GES_OBS="$DMPDIR/$GDATE/$GDUMP"
 fi
 
 # COMIN_GES, COMIN_ANL COMIN_GES_ENS, and COMOUT  are used in exglobal script
-# TO DO: Map NCO's directory into these variables
-COMIN_GES_CTL="$ROTDIR/gdas.$gPDY/$gcyc"
-export COMIN_ANL="$ROTDIR/$CDUMP.$PDY/$cyc"
-export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc"
+COMIN_GES_CTL="$ROTDIR/gdas.$gPDY/$gcyc/$COMPONENT"
+export COMIN_ANL="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/$COMPONENT"
 export COMIN_GES=$COMIN_GES_ENS
-export COMOUT="$ROTDIR/enkf$CDUMP.$PDY/$cyc"
+export COMOUT="$ROTDIR/enkf$CDUMP.$PDY/$cyc/$COMPONENT"
 
 
 export ATMGES_ENSMEAN="$COMIN_GES_ENS/${GPREFIX}atmf006$GSUFFIX"
diff --git a/jobs/JGLOBAL_ENKF_UPDATE b/jobs/JGLOBAL_ENKF_UPDATE
index b66b7e287..e3e3ae00b 100755
--- a/jobs/JGLOBAL_ENKF_UPDATE
+++ b/jobs/JGLOBAL_ENKF_UPDATE
@@ -57,6 +57,7 @@ export pgmerr=errfile
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export COMPONENT=${COMPONENT:-atmos}
 if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
@@ -77,9 +78,8 @@ export GSUFFIX=${GSUFFIX:-$SUFFIX}
 
 
 # COMIN_GES_ENS and COMOUT_ANL_ENS are used in exglobal script
-# TO DO: Map NCO's directory into these variables
-export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc"
-export COMOUT_ANL_ENS="$ROTDIR/enkf$CDUMP.$PDY/$cyc"
+export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/$COMPONENT"
+export COMOUT_ANL_ENS="$ROTDIR/enkf$CDUMP.$PDY/$cyc/$COMPONENT"
 
 
 ###############################################################
diff --git a/util/Minimization_Monitor/nwprod/gdas.v1.0.0/jobs/JGDAS_VMINMON b/util/Minimization_Monitor/nwprod/gdas.v1.0.0/jobs/JGDAS_VMINMON
index 3c584893f..76ded58f0 100755
--- a/util/Minimization_Monitor/nwprod/gdas.v1.0.0/jobs/JGDAS_VMINMON
+++ b/util/Minimization_Monitor/nwprod/gdas.v1.0.0/jobs/JGDAS_VMINMON
@@ -7,11 +7,11 @@ echo `date` $0 `date -u` begin
 export PS4='$SECONDS + '
 
 ###############################
-# Specify NET and RUN name
+# Specify NET, RUN, and COMPONENT name
 ##############################
 export NET=${NET:-gfs}
 export RUN=${RUN:-gdas}
-
+export COMPONENT=${COMPONENT:-atmos}
 
 ###########################################################
 # obtain unique process id (pid) and make temp directories
@@ -70,11 +70,11 @@ export p_cyc=`echo ${cdate} | cut -c9-10`
 export COM_IN=${COM_IN:-${COMROOT}/${NET}/${envir}}
 
 M_TANKverf=${M_TANKverf:-${COM_IN}}
-M_TANKverfM0=${M_TANKverfM0:-${M_TANKverf}/${RUN}.${PDY}/${cyc}/minmon}
-export M_TANKverfM1=${M_TANKverfM1:-${M_TANKverf}/${RUN}.${P_PDY}/${p_cyc}/minmon}
+M_TANKverfM0=${M_TANKverfM0:-${M_TANKverf}/${RUN}.${PDY}/${cyc}/$COMPONENT/minmon}
+export M_TANKverfM1=${M_TANKverfM1:-${M_TANKverf}/${RUN}.${P_PDY}/${p_cyc}/$COMPONENT/minmon}
 export M_TANKverf=$M_TANKverfM0
 
-export COMIN=${COMIN:-$COM_IN/${RUN}.${PDY}/${cyc}}
+export COMIN=${COMIN:-$COM_IN/${RUN}.${PDY}/${cyc}/$COMPONENT}
 
 mkdir -p -m 775 $M_TANKverf
 
diff --git a/util/Minimization_Monitor/nwprod/gfs.v1.0.0/jobs/JGFS_VMINMON b/util/Minimization_Monitor/nwprod/gfs.v1.0.0/jobs/JGFS_VMINMON
index bdc78268c..e6f373cb4 100755
--- a/util/Minimization_Monitor/nwprod/gfs.v1.0.0/jobs/JGFS_VMINMON
+++ b/util/Minimization_Monitor/nwprod/gfs.v1.0.0/jobs/JGFS_VMINMON
@@ -11,6 +11,7 @@ export PS4='$SECONDS + '
 ##############################
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
+export COMPONENT=${COMPONENT:-atmos}
 
 
 ###########################################################
@@ -76,11 +77,11 @@ TANK_USE_RUN=${TANK_USE_RUN:-1}
 export COM_IN=${COM_IN:-${COMROOT}/${NET}/${envir}}
 
 M_TANKverf=${M_TANKverf:-${COM_IN}}
-M_TANKverfM0=${M_TANKverfM0:-${M_TANKverf}/${RUN}.${PDY}/${cyc}/minmon}
-export M_TANKverfM1=${M_TANKverfM1:-${M_TANKverf}/${RUN}.${P_PDY}/${p_cyc}/minmon}
+M_TANKverfM0=${M_TANKverfM0:-${M_TANKverf}/${RUN}.${PDY}/${cyc}/$COMPONENT/minmon}
+export M_TANKverfM1=${M_TANKverfM1:-${M_TANKverf}/${RUN}.${P_PDY}/${p_cyc}/$COMPONENT/minmon}
 export M_TANKverf=$M_TANKverfM0
 
-export COMIN=${COMIN:-$COM_IN/${RUN}.${PDY}/${cyc}}
+export COMIN=${COMIN:-$COM_IN/${RUN}.${PDY}/${cyc}/$COMPONENT}
 
 mkdir -p -m 775 $M_TANKverf
  
diff --git a/util/Ozone_Monitor/nwprod/gdas_oznmon.v2.0.0/jobs/JGDAS_VERFOZN b/util/Ozone_Monitor/nwprod/gdas_oznmon.v2.0.0/jobs/JGDAS_VERFOZN
index cc0754954..4a7b41ec6 100755
--- a/util/Ozone_Monitor/nwprod/gdas_oznmon.v2.0.0/jobs/JGDAS_VERFOZN
+++ b/util/Ozone_Monitor/nwprod/gdas_oznmon.v2.0.0/jobs/JGDAS_VERFOZN
@@ -7,10 +7,11 @@ echo `date` $0 `date -u` begin
 export PS4='$SECONDS + '
 
 ###############################
-# Specify NET and RUN name
+# Specify NET, RUN, and COMPONENT name
 ##############################
 export NET=${NET:-gfs}
 export RUN=${RUN:-gdas}
+export COMPONENT=${COMPONENT:-atmos}
 
 ###########################################################
 # obtain unique process id (pid) and make temp directories
@@ -75,10 +76,10 @@ export p_cyc=`echo ${cdate} | cut -c9-10`
 # OZN_TANKDIR - WHERE OUTPUT DATA WILL RESIDE
 #
 echo "pre-assignment, OZN_TANKDIR = $OZN_TANKDIR"
-export TANKverf_ozn=${TANKverf_ozn:-${OZN_TANKDIR}/${RUN}.${PDY}/${cyc}/oznmon}
-export TANKverf_oznM1=${TANKverf_oznM1:-${OZN_TANKDIR}/${RUN}.${P_PDY}/${p_cyc}/oznmon}
+export TANKverf_ozn=${TANKverf_ozn:-${OZN_TANKDIR}/${RUN}.${PDY}/${cyc}/$COMPONENT/oznmon}
+export TANKverf_oznM1=${TANKverf_oznM1:-${OZN_TANKDIR}/${RUN}.${P_PDY}/${p_cyc}/$COMPONENT/oznmon}
 export COM_IN=${COM_IN:-${COMROOT}/${NET}/${envir}}
-export COMIN=${COMIN:-${COM_IN}/${RUN}.${PDY}/${cyc}}
+export COMIN=${COMIN:-${COM_IN}/${RUN}.${PDY}/${cyc}/$COMPONENT}
 
 if [[ ! -d ${TANKverf_ozn} ]]; then
    mkdir -p -m 775 $TANKverf_ozn
diff --git a/util/Ozone_Monitor/nwprod/gdas_oznmon.v2.0.0/scripts/exgdas_vrfyozn.sh.ecf b/util/Ozone_Monitor/nwprod/gdas_oznmon.v2.0.0/scripts/exgdas_vrfyozn.sh.ecf
index 8a937e1be..82f8c1fca 100755
--- a/util/Ozone_Monitor/nwprod/gdas_oznmon.v2.0.0/scripts/exgdas_vrfyozn.sh.ecf
+++ b/util/Ozone_Monitor/nwprod/gdas_oznmon.v2.0.0/scripts/exgdas_vrfyozn.sh.ecf
@@ -43,6 +43,7 @@ export RUN_ENVIR=${RUN_ENVIR:-nco}
 export NET=${NET:-gfs}
 export RUN=${RUN:-gdas}
 export envir=${envir:-prod}
+export COMPONENT=${COMPONENT:-atmos}
 
 #  Command line arguments
 export PDY=${1:-${PDY:?}} 
@@ -51,7 +52,7 @@ export cyc=${2:-${cyc:?}}
 #  Directories
 export OZN_WORK_DIR=${OZN_WORK_DIR:-$(pwd)}
 export COM_IN=${COM_IN:-${COMROOT}/${NET}/${envir}}
-export COMIN=${COMIN:-$COM_IN/${RUN}.${PDY}}
+export COMIN=${COMIN:-$COM_IN/${RUN}.${PDY}/${cyc}/$COMPONENT}
 
 export HOMEgdas_ozn=${HOMEgdas_ozn:-${NWROOT}/gdas.${gdas_oznmon_ver}}
 export FIXgdas_ozn=${FIXgdas_ozn:-$HOMEgdas/fix}
diff --git a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/jobs/JGDAS_VERFRAD b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/jobs/JGDAS_VERFRAD
index c7f4cd45c..686926132 100755
--- a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/jobs/JGDAS_VERFRAD
+++ b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/jobs/JGDAS_VERFRAD
@@ -7,10 +7,11 @@ echo `date` $0 `date -u` begin
 export PS4='$SECONDS + '
 
 ###############################
-# Specify NET and RUN name
+# Specify NET, RUN, and COMPONENT name
 ##############################
 export NET=${NET:-gfs}
 export RUN=${RUN:-gdas}
+export COMPONENT=${COMPONENT:-atmos}
 
 ########################################################### 
 # obtain unique process id (pid) and make temp directories
@@ -77,10 +78,10 @@ export p_cyc=`echo ${cdate} | cut -c9-10`
 # TANKverf - WHERE OUTPUT DATA WILL RESIDE
 #############################################
 export TANKverf=${TANKverf:-${COMROOT}/${NET}/${envir}}
-export TANKverf_rad=${TANKverf_rad:-${TANKverf}/${RUN}.${PDY}/${cyc}/radmon}
-export TANKverf_radM1=${TANKverf_radM1:-${TANKverf}/${RUN}.${P_PDY}/${p_cyc}/radmon}
+export TANKverf_rad=${TANKverf_rad:-${TANKverf}/${RUN}.${PDY}/${cyc}/$COMPONENT/radmon}
+export TANKverf_radM1=${TANKverf_radM1:-${TANKverf}/${RUN}.${P_PDY}/${p_cyc}/$COMPONENT/radmon}
 export COM_IN=${COM_IN:-${COMROOT}/${NET}/${envir}}
-export COMIN=${COMIN:-${COM_IN}/${RUN}.${PDY}/${cyc}}
+export COMIN=${COMIN:-${COM_IN}/${RUN}.${PDY}/${cyc}/$COMPONENT}
 
 mkdir -p -m 775 $TANKverf_rad
  
diff --git a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/scripts/exgdas_vrfyrad.sh.ecf b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/scripts/exgdas_vrfyrad.sh.ecf
index 771a5a549..aea12c828 100755
--- a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/scripts/exgdas_vrfyrad.sh.ecf
+++ b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/scripts/exgdas_vrfyrad.sh.ecf
@@ -34,6 +34,7 @@ export RUN_ENVIR=${RUN_ENVIR:-nco}
 export NET=${NET:-gfs}
 export RUN=${RUN:-gdas}
 export envir=${envir:-prod}
+export COMPONENT=${COMPONENT:-atmos}
 
 #  Command line arguments
 export PDY=${1:-${PDY:?}} 
@@ -42,7 +43,7 @@ export cyc=${2:-${cyc:?}}
 #  Directories
 export DATA=${DATA:-$(pwd)}
 export COM_IN=${COMROOT}/${NET}/${envir}
-export COMIN=${COMIN:-$COM_IN/${RUN}.${PDY}}
+export COMIN=${COMIN:-$COM_IN/${RUN}.${PDY}/${cyc}/$COMPONENT}
 
 
 #  Filenames