diff --git a/scripts/exgfs_tc_genesis.sh b/scripts/exgfs_tc_genesis.sh
index eba9ba2..9607352 100755
--- a/scripts/exgfs_tc_genesis.sh
+++ b/scripts/exgfs_tc_genesis.sh
@@ -8,7 +8,7 @@ export cmodel=gfs
 #export gfsdir=${COMINgfs}
 export COMPONENT=${COMPONENT:-atmos}
 #export gfsdir=${COMINgfs}/${cyc}/${COMPONENT}
-export gfsdir=${gfsdir:-${COMINgfs}/${cyc}/${COMPONENT}}
+export gfsdir=${gfsdir:-${COMINgfs}}
 
 #-----------input data checking -----------------
 ${USHens_tracker}/data_check_gfs.sh
diff --git a/ush/extrkr_fsu.sh b/ush/extrkr_fsu.sh
index dd4bc95..50a0382 100755
--- a/ush/extrkr_fsu.sh
+++ b/ush/extrkr_fsu.sh
@@ -38,9 +38,7 @@ cd $TRKDATA
 #unlink $HOMEens_tracker/tclogg/genesis_guidance/model_config.cfg
 #ln -sf ${namelist} $HOMEens_tracker/tclogg/genesis_guidance/model_config.cfg
 
-#export file_name=${gfsdir}/gfs.{date:%Y%m%d}/{date:%H}/gfs.t{date:%H}z.pgrb2.0p25.f{fhr:03}
-export COMPONENT=${COMPONENT:-atmos}
-export file_name=${gfsdir}/gfs.{date:%Y%m%d}/{date:%H}/${COMPONENT}/gfs.t{date:%H}z.pgrb2.0p25.f{fhr:03}
+export file_name=${gfsdir/${PDY}\/${cyc}/'{date:%Y%m%d}/{date:%H}'}/gfs.t{date:%H}z.pgrb2.0p25.f{fhr:03}
 ${BINens_tracker}/tclogg_track --date ${ymdh} --odir $TRKDATA --fname_template=${file_name}
 
 #if [ "$SENDCOM" = 'YES' ]; then
diff --git a/ush/extrkr_gfs.sh b/ush/extrkr_gfs.sh
index abf5bc3..27ca835 100755
--- a/ush/extrkr_gfs.sh
+++ b/ush/extrkr_gfs.sh
@@ -151,7 +151,7 @@ case ${cmodel} in
        echo " ++ operational FV3-GDAS chosen"               ;
        echo " "; set -x                                    ;
 #       gdasdir=${gdasdir:-${COMINgdas:?}/${cyc}}                   ;
-       gdasdir=${gdasdir:-${COMINgdas:?}/${cyc}/${COMPONENT}}    ;
+       gdasdir=${gdasdir:-${COMINgdas:?}}    ;
        gdasgfile=gdas.t${cyc}z.pgrb2.0p25.f                 ;
 
        vit_incr=${FHOUT_CYCLONE:-3}                        ;
@@ -207,7 +207,7 @@ case ${cmodel} in
        echo " ++ operational FV3-GFS chosen"               ;
        echo " "; set -x                                    ;
 #       gfsdir=${gfsdir:-${COMINgfs:?}/${cyc}}                     ;
-       gfsdir=${gfsdir:-${COMINgfs:?}/${cyc}/${COMPONENT}} ;
+       gfsdir=${gfsdir:-${COMINgfs:?}} ;
        gfsgfile=gfs.t${cyc}z.pgrb2.0p25.f                  ;
 
        vit_incr=${FHOUT_CYCLONE:-6}                        ;
@@ -642,9 +642,9 @@ then
   #synvitdir=${COMINgfs:?}/${cyc}/${COMPONENT}
   synvitdir=${COMINgfs:?}
   synvitfile=gfs.t${cyc}z.syndata.tcvitals.tm00
-  synvitold_dir=${synvitdir%.*}.${old_4ymd}/${old_hh}/${COMPONENT}
+  synvitold_dir="${COMINgfs/${PDY}\/${cyc}/${old_4ymd}/${old_hh}}"
   synvitold_file=gfs.t${old_hh}z.syndata.tcvitals.tm00
-  synvitfuture_dir=${synvitdir%.*}.${future_4ymd}/${future_hh}/${COMPONENT}
+  synvitfuture_dir="${COMINgfs/${PDY}\/${cyc}/${future_4ymd}/${future_hh}}"
   synvitfuture_file=gfs.t${future_hh}z.syndata.tcvitals.tm00
 else
 #  synvitdir=${COMROOT}/nam/prod/nam.${PDY}
diff --git a/ush/extrkr_tcv_gfs.sh b/ush/extrkr_tcv_gfs.sh
index 6345db2..3950c9d 100755
--- a/ush/extrkr_tcv_gfs.sh
+++ b/ush/extrkr_tcv_gfs.sh
@@ -179,7 +179,7 @@ case ${cmodel} in
   gfs) set +x; echo " "                                    ;
        echo " ++ operational FV3-GFS chosen"               ;
        echo " "; set -x                                    ;
-       gfsdir=${gfsdir:-${COMINgfs:?}/${cyc}/${COMPONENT}}  ;
+       gfsdir=${gfsdir:-${COMINgfs:?}}  ;
        gfsgfile=gfs.t${cyc}z.pgrb2.0p25.f                  ;
 
        vit_incr=${FHOUT_CYCLONE:-6}                        ;
@@ -414,11 +414,11 @@ future_str="${future_ymd} ${future_hh}00"
 
 if [ ${modtyp} = 'global' ]
 then
-  synvitdir=${COMINgfs:?}/${cyc}/${COMPONENT}
+  synvitdir="${COMINgfs:?}"
   synvitfile=gfs.t${cyc}z.syndata.tcvitals.tm00
-  synvitold_dir=${synvitdir%.*}.${old_4ymd}/${old_hh}/${COMPONENT}
+  synvitold_dir="${COMINgfs/${PDY}\/${cyc}/${old_4ymd}/${old_hh}}"
   synvitold_file=gfs.t${old_hh}z.syndata.tcvitals.tm00
-  synvitfuture_dir=${synvitdir%.*}.${future_4ymd}/${future_hh}/${COMPONENT}
+  synvitfuture_dir="${COMINgfs/${PDY}\/${cyc}/${future_4ymd}/${future_hh}}"
   synvitfuture_file=gfs.t${future_hh}z.syndata.tcvitals.tm00
 else
 #  synvitdir=${COMROOT}/nam/prod/nam.${PDY}