diff --git a/gempak/ush/gefs_meta_850.sh_comb b/gempak/ush/gefs_meta_850.sh_comb
index 3fe78ad49..473407b75 100755
--- a/gempak/ush/gefs_meta_850.sh_comb
+++ b/gempak/ush/gefs_meta_850.sh_comb
@@ -71,12 +71,20 @@ for area in us sam; do
       for fn in $(echo $grids); do
         rm -rf $fn ${fn}_6
 
-        INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+        if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+          INFILE=${COMIN}/${fn}/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+        else
+          INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+        fi
         if [ -r ${INFILE} ]; then
           ln -s ${INFILE} $fn
         fi
 
-        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/ge${fn}${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+        if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+          INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/${fn}/atmos/products/gempak/gefs${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+        else
+          INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/ge${fn}${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+        fi
         if [ -r ${INFILE} ]; then
           ln -s ${INFILE} ${fn}_6
         fi
@@ -84,14 +92,22 @@ for area in us sam; do
 
       fn=gefs_avg
       rm -rf ${fn}
-      INFILE=${COMIN}/${COMPONENT}/gempak/geavg${sGrid}_${PDY}${cyc}f${fcsthr}
+      if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+        INFILE=${COMIN}/avg/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+      else
+        INFILE=${COMIN}/${COMPONENT}/gempak/geavg${sGrid}_${PDY}${cyc}f${fcsthr}
+      fi
       if [ -r ${INFILE} ]; then
         ln -s ${INFILE} ${fn}
       fi
 
       fn=gefs_avg_6
       rm -rf ${fn}
-      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/geavg${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/avg/atmos/products/gempak/gefs${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      else
+        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/geavg${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      fi
       if [ -r ${INFILE} ]; then
         ln -s ${INFILE} ${fn}
       fi
@@ -408,9 +424,9 @@ if [[ $err != 0 ]]; then
 fi
 
 if [ $SENDCOM = "YES" ] ; then
-  mv ${metaname} ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+  mv ${metaname} ${COMOUT}/${metaname}
   if [ $SENDDBN = "YES" ] ; then
-    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/${metaname}
   fi
 fi
 
diff --git a/gempak/ush/gefs_meta_carib_spag.sh_comb b/gempak/ush/gefs_meta_carib_spag.sh_comb
index 9c232a52e..229dac2c2 100755
--- a/gempak/ush/gefs_meta_carib_spag.sh_comb
+++ b/gempak/ush/gefs_meta_carib_spag.sh_comb
@@ -78,12 +78,20 @@ for pres in 200 250 300; do
       for fn in $(echo $grids); do
         rm -rf $fn ${fn}_6
 
-        INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+        if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+          INFILE=${COMIN}/${fn}/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+        else
+          INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+        fi
         if [ -r ${INFILE} ]; then
           ln -s ${INFILE} $fn
         fi
 
-        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/ge${fn}${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+        if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+          INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/${fn}/atmos/products/gempak/gefs${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+        else
+          INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/ge${fn}${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+        fi
         if [ -r ${INFILE} ]; then
           ln -s ${INFILE} ${fn}_6
         fi
@@ -91,14 +99,22 @@ for pres in 200 250 300; do
 
       fn=gefs_avg
       rm -rf ${fn}
-      INFILE=${COMIN}/${COMPONENT}/gempak/geavg${sGrid}_${PDY}${cyc}f${fcsthr}
+      if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+        INFILE=${COMIN}/avg/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+      else
+        INFILE=${COMIN}/${COMPONENT}/gempak/geavg${sGrid}_${PDY}${cyc}f${fcsthr}
+      fi
       if [ -r ${INFILE} ]; then
         ln -s ${INFILE} ${fn}
       fi
 
       fn=gefs_avg_6
       rm -rf ${fn}
-      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/geavg${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/avg/atmos/products/gempak/gefs${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      else
+        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/geavg${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      fi
       if [ -r ${INFILE} ]; then
         ln -s ${INFILE} ${fn}
       fi
@@ -425,9 +441,9 @@ if [[ $err != 0 ]]; then
 fi
 
 if [ $SENDCOM = "YES" ] ; then
-  mv ${metaname} ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+  mv ${metaname} ${COMOUT}/${metaname}
   if [ $SENDDBN = "YES" ] ; then
-    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/${metaname}
   fi
 fi
 
diff --git a/gempak/ush/gefs_meta_hi_spag.sh_comb b/gempak/ush/gefs_meta_hi_spag.sh_comb
index b1b5855de..b50661ade 100755
--- a/gempak/ush/gefs_meta_hi_spag.sh_comb
+++ b/gempak/ush/gefs_meta_hi_spag.sh_comb
@@ -63,12 +63,20 @@ for level in ${levels}; do
     for fn in $(echo $grids); do
       rm -rf $fn ${fn}_6
 
-      INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+      if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+        INFILE=${COMIN}/${fn}/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+      else
+        INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+      fi
       if [ -r ${INFILE} ]; then
         ln -s ${INFILE} $fn
       fi
 
-      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/ge${fn}${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/${fn}/atmos/products/gempak/gefs${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      else
+        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/ge${fn}${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      fi
       if [ -r ${INFILE} ]; then
         ln -s ${INFILE} ${fn}_6
       fi
@@ -76,14 +84,22 @@ for level in ${levels}; do
 
     fn=gefs_avg
     rm -rf ${fn}
-    INFILE=${COMIN}/${COMPONENT}/gempak/geavg${sGrid}_${PDY}${cyc}f${fcsthr}
+    if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+      INFILE=${COMIN}/avg/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+    else
+      INFILE=${COMIN}/${COMPONENT}/gempak/geavg${sGrid}_${PDY}${cyc}f${fcsthr}
+    fi
     if [ -r ${INFILE} ]; then
       ln -s ${INFILE} ${fn}
     fi
 
     fn=gefs_avg_6
     rm -rf ${fn}
-    INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/geavg${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+    if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/avg/atmos/products/gempak/gefs${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+    else
+      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/geavg${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+    fi
     if [ -r ${INFILE} ]; then
       ln -s ${INFILE} ${fn}
     fi
@@ -416,9 +432,9 @@ if [[ $err != 0 ]]; then
 fi
 
 if [ $SENDCOM = "YES" ] ; then
-  mv ${metaname} ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+  mv ${metaname} ${COMOUT}/${metaname}
   if [ $SENDDBN = "YES" ] ; then
-    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/${metaname}
   fi
 fi
 
diff --git a/gempak/ush/gefs_meta_lows.sh_comb b/gempak/ush/gefs_meta_lows.sh_comb
index c9b5fc880..22061305d 100755
--- a/gempak/ush/gefs_meta_lows.sh_comb
+++ b/gempak/ush/gefs_meta_lows.sh_comb
@@ -90,12 +90,20 @@ for area in nam us trop sam hi; do
     do
       rm -rf $fn ${fn}_6
 
-      INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+      if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+        INFILE=${COMIN}/${fn}/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+      else
+        INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+      fi
       if [ -r ${INFILE} ]; then
         ln -s ${INFILE} $fn
       fi
 
-      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/ge${fn}${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/${fn}/atmos/products/gempak/gefs${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      else
+        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/ge${fn}${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      fi
       if [ -r ${INFILE} ]; then
         ln -s ${INFILE} ${fn}_6
       fi
@@ -103,14 +111,22 @@ for area in nam us trop sam hi; do
 
     fn=gefs_avg
     rm -rf ${fn}
-    INFILE=${COMIN}/${COMPONENT}/gempak/geavg${sGrid}_${PDY}${cyc}f${fcsthr}
+    if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+      INFILE=${COMIN}/avg/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+    else
+      INFILE=${COMIN}/${COMPONENT}/gempak/geavg${sGrid}_${PDY}${cyc}f${fcsthr}
+    fi
     if [ -r ${INFILE} ]; then
       ln -s ${INFILE} ${fn}
     fi
 
     fn=gefs_avg_6
     rm -rf ${fn}
-    INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/geavg${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+    if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/avg/atmos/products/gempak/gefs${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+    else
+      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/geavg${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+    fi
     if [ -r ${INFILE} ]; then
       ln -s ${INFILE} ${fn}
     fi
@@ -430,9 +446,9 @@ if [[ $err != 0 ]]; then
 fi
 
 if [ $SENDCOM = "YES" ] ; then
-  mv ${metaname} ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+  mv ${metaname} ${COMOUT}/${metaname}
   if [ $SENDDBN = "YES" ] ; then
-    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/${metaname}
   fi
 fi
 
diff --git a/gempak/ush/gefs_meta_mar_00Z.sh b/gempak/ush/gefs_meta_mar_00Z.sh
index 733af868f..48c228b5c 100755
--- a/gempak/ush/gefs_meta_mar_00Z.sh
+++ b/gempak/ush/gefs_meta_mar_00Z.sh
@@ -72,7 +72,11 @@ for metaarea in pac atl; do
       grids=${memberlist}
       for fn in $(echo $grids); do
         rm -rf $fn
-        INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+        if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+          INFILE=${COMIN}/${fn}/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+        else
+          INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+        fi
         if [ -r ${INFILE} ]; then
           ln -s ${INFILE} $fn
         fi
@@ -454,9 +458,9 @@ for metaarea in pac atl; do
   fi
 
   if [ $SENDCOM = "YES" ] ; then
-    mv ${metaname} ${COMOUT}/$COMPONENT/gempak/meta/
+    mv ${metaname} ${COMOUT}/
     if [ $SENDDBN = "YES" ] ; then
-      $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/$COMPONENT/gempak/meta/${metaname}
+      $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/${metaname}
     fi
   fi
 done
diff --git a/gempak/ush/gefs_meta_mar_12Z.sh b/gempak/ush/gefs_meta_mar_12Z.sh
index 5b500c388..fde25fcc3 100755
--- a/gempak/ush/gefs_meta_mar_12Z.sh
+++ b/gempak/ush/gefs_meta_mar_12Z.sh
@@ -63,7 +63,11 @@ for metaarea in pac atl; do
       grids=${memberlist}
       for fn in $(echo $grids); do
         rm -rf $fn
-        INFILE=${COMIN}/$COMPONENT/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+        if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+          INFILE=${COMIN}/${fn}/$COMPONENT/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+        else
+          INFILE=${COMIN}/$COMPONENT/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+        fi
         if [ -r ${INFILE} ]; then
           ln -s ${INFILE} $fn
         fi
@@ -212,7 +216,11 @@ for metaarea in pac atl; do
     grids=${memberlist}
     for fn in $(echo $grids); do
       rm -rf $fn
-      INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+      if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+        INFILE=${COMIN}/${fn}/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+      else
+        INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+      fi
       if [ -r ${INFILE} ]; then
         ln -s ${INFILE} $fn
       fi
@@ -372,9 +380,9 @@ for metaarea in pac atl; do
   fi
 
   if [ $SENDCOM = "YES" ] ; then
-    mv ${metaname} ${COMOUT}/$COMPONENT/gempak/meta/
+    mv ${metaname} ${COMOUT}/
     if [ $SENDDBN = "YES" ] ; then
-      $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/$COMPONENT/gempak/meta/${metaname}
+      $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/${metaname}
     fi
   fi
 done
diff --git a/gempak/ush/gefs_meta_nam_spag.sh_comb b/gempak/ush/gefs_meta_nam_spag.sh_comb
index 9e6b32135..e94e77064 100755
--- a/gempak/ush/gefs_meta_nam_spag.sh_comb
+++ b/gempak/ush/gefs_meta_nam_spag.sh_comb
@@ -85,12 +85,20 @@ for level in ${levels}; do
     for fn in $(echo $grids); do
       rm -rf $fn ${fn}_6
 
-      INFILE=${COMIN}/$COMPONENT/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+      if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+        INFILE=${COMIN}/${fn}/$COMPONENT/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+      else
+        INFILE=${COMIN}/$COMPONENT/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+      fi
       if [ -r ${INFILE} ]; then
         ln -s ${INFILE} $fn
       fi
 
-      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/ge${fn}${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/${fn}/atmos/products/gempak/gefs${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      else
+        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/ge${fn}${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      fi
       if [ -r ${INFILE} ]; then
         ln -s ${INFILE} ${fn}_6
       fi
@@ -98,14 +106,22 @@ for level in ${levels}; do
 
     fn=gefs_avg
     rm -rf ${fn}
-    INFILE=${COMIN}/$COMPONENT/gempak/geavg${sGrid}_${PDY}${cyc}f${fcsthr}
+    if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+      INFILE=${COMIN}/avg/$COMPONENT/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+    else
+      INFILE=${COMIN}/$COMPONENT/gempak/geavg${sGrid}_${PDY}${cyc}f${fcsthr}
+    fi
     if [ -r ${INFILE} ]; then
       ln -s ${INFILE} ${fn}
     fi
 
     fn=gefs_avg_6
     rm -rf ${fn}
-    INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/geavg${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+    if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/avg/atmos/products/gempak/gefs${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+    else
+      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/geavg${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+    fi
     if [ -r ${INFILE} ]; then
       ln -s ${INFILE} ${fn}
     fi
@@ -420,9 +436,9 @@ if [[ $err != 0 ]]; then
 fi
 
 if [ $SENDCOM = "YES" ] ; then
-  mv ${metaname} ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+  mv ${metaname} ${COMOUT}/${metaname}
   if [ $SENDDBN = "YES" ] ; then
-    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/${metaname}
   fi
 fi
 
diff --git a/gempak/ush/gefs_meta_qpf.sh b/gempak/ush/gefs_meta_qpf.sh
index 962ea5460..30279e98c 100755
--- a/gempak/ush/gefs_meta_qpf.sh
+++ b/gempak/ush/gefs_meta_qpf.sh
@@ -22,7 +22,7 @@ fi
 echo "memberlist=$memberlist"
 
 # datatypes.tbl uses COMIN, so have to update it locally
-COMIN="$COMIN/$COMPONENT/gempak"
+COMINgefs=${COMIN}
 
 sGrid=${sGrid} #:-"_0p50"}
 
@@ -52,7 +52,11 @@ fcsthrs="036 048 060 072 084 096 108 120 132 144 156 168 180 192 204" # shorten
 for fcsthr in ${fcsthrs}; do
   for fn in $(echo $memberlist); do
     rm -rf $fn
-    INFILE=${COMIN}/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+    if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+      INFILE=${COMINgefs}/${fn}/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+    else
+      INFILE=${COMINgefs}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+    fi
     if [ -r ${INFILE} ]; then
       ln -s ${INFILE} $fn
     fi
@@ -144,9 +148,9 @@ if [[ $err != 0 ]]; then
 fi
 
 if [ $SENDCOM = "YES" ] ; then
-  mv ${metaname} ${COMOUT}/$COMPONENT/gempak/meta/ #$metaname
+  mv ${metaname} ${COMOUT}/
   if [ $SENDDBN = "YES" ] ; then
-    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/${metaname}
   fi
 fi
 
@@ -286,7 +290,19 @@ for area in us sam us12 us24; do
     fcmdfile=cmdfile_meta_samqpf
   fi
 
-  ln -s $COMIN/ge*${sGrid}_${PDY}${cyc}f* ./
+  if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+    for fn in $(echo $memberlist); do
+      for f in `ls ${COMINgefs}/${fn}/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f*`
+      do
+        echo ${f}
+        f_base=$(basename ${f})
+        f_base=${f_base/gefs/ge${fn}}
+        ln -s ${f} ./${f_base}
+      done
+    done
+  else
+    ln -s ${COMINgefs}/${COMPONENT}/gempak/ge*${sGrid}_${PDY}${cyc}f* ./
+  fi
   ln -s $COMINsgfs/gfs.${PDY}/${cyc}/gempak/gfs${sGrid}_${PDY}${cyc}f* ./
   #ln -s $COMINecmwf.${PDYm1}/gempak/ecmwf_hr_${PDYm1}${cycm12}f* ./
   #ln -s $COMINecmwf.${PDY}/gempak/ecmwf_hr_${PDY}${cycm12}f* ./
@@ -297,19 +313,16 @@ for area in us sam us12 us24; do
     #grid=$(echo $grid | tr [a-z] [A-Z])
     if [ ${grid} = "GFS" ]; then
       GDFILE="F-GFS | ${ddate}/${cyc}00"
-      COMINtmp=$COMIN
+#      COMINtmp=$COMIN
       # #export COMIN=$COMINsgfs/gfs.${PDY}/${cyc}/gempak
-      export COMIN=./
     elif [ ${grid} = "ECMWF" ]; then
       if [ $cyc = "12" ]; then
-        COMINtmp=$COMIN
+#        COMINtmp=$COMIN
         # #export COMIN=$COMINecmwf.${PDY}/gempak
-        export COMIN=./
         GDFILE="F-ECMWF | ${ddate}/${cycm12}00"
       else
-        COMINtmp=$COMIN
+#        COMINtmp=$COMIN
         # #export COMIN=$COMINecmwf.${PDYm1}/gempak
-        export COMIN=./
         GDFILE="F-ECMWF | ${ddatem1}/${cycm12}00"
       fi
       if [ ${area} = "us" ]; then
@@ -317,9 +330,9 @@ for area in us sam us12 us24; do
       fi
     else
       GDFILE="F-GEFS$grid | ${ddate}/${cyc}00"
-      COMINtmp=$COMIN
-      export COMIN=./
+#      COMINtmp=$COMIN
     fi
+    export COMIN=./
 
     cat > $fcmdfile  <<- EOF
 			DEVICE  = ${device}
@@ -367,7 +380,7 @@ for area in us sam us12 us24; do
       exit $err
     fi
 
-    export COMIN=$COMINtmp
+#    export COMIN=$COMINtmp
   done
 
   #####################################################
@@ -387,9 +400,9 @@ for area in us sam us12 us24; do
 
 
   if [ $SENDCOM = "YES" ] ; then
-    mv ${metaname} ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+    mv ${metaname} ${COMOUT}/
     if [ $SENDDBN = "YES" ] ; then
-      $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+      $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/${metaname}
     fi
   fi
 
diff --git a/gempak/ush/gefs_meta_sam_spag.sh_comb b/gempak/ush/gefs_meta_sam_spag.sh_comb
index 97e3f7108..e366e5ee4 100755
--- a/gempak/ush/gefs_meta_sam_spag.sh_comb
+++ b/gempak/ush/gefs_meta_sam_spag.sh_comb
@@ -89,12 +89,20 @@ for level in ${levels}; do
     for fn in $(echo $grids); do
       rm -rf $fn ${fn}_6
 
-      INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+      if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+        INFILE=${COMIN}/${fn}/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+      else
+        INFILE=${COMIN}/${COMPONENT}/gempak/ge${fn}${sGrid}_${PDY}${cyc}f${fcsthr}
+      fi
       if [ -r ${INFILE} ]; then
         ln -s ${INFILE} $fn
       fi
 
-      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/ge${fn}${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/${fn}/atmos/products/gempak/gefs${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      else
+        INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/ge${fn}${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+      fi
       if [ -r ${INFILE} ]; then
         ln -s ${INFILE} ${fn}_6
       fi
@@ -102,14 +110,22 @@ for level in ${levels}; do
 
     fn=gefs_avg
     rm -rf ${fn}
-    INFILE=${COMIN}/${COMPONENT}/gempak/geavg${sGrid}_${PDY}${cyc}f${fcsthr}
+    if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+      INFILE=${COMIN}/avg/${COMPONENT}/products/gempak/gefs${sGrid}_${PDY}${cyc}f${fcsthr}
+    else
+      INFILE=${COMIN}/${COMPONENT}/gempak/geavg${sGrid}_${PDY}${cyc}f${fcsthr}
+    fi
     if [ -r ${INFILE} ]; then
       ln -s ${INFILE} ${fn}
     fi
 
     fn=gefs_avg_6
     rm -rf ${fn}
-    INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/geavg${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+    if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/avg/atmos/products/gempak/gefs${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+    else
+      INFILE=${COMINs}/gefs.${PDY_6}/${cyc_6}/atmos/gempak/geavg${sGrid}_${PDY_6}${cyc_6}f${fcsthr_6}
+    fi
     if [ -r ${INFILE} ]; then
       ln -s ${INFILE} ${fn}
     fi
@@ -421,9 +437,9 @@ if [[ $err != 0 ]]; then
 fi
 
 if [ $SENDCOM = "YES" ] ; then
-  mv ${metaname} ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+  mv ${metaname} ${COMOUT}/
   if [ $SENDDBN = "YES" ] ; then
-    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/$COMPONENT/gempak/meta/$metaname
+    $DBNROOT/bin/dbn_alert MODEL ${DBN_ALERT_TYPE} $job ${COMOUT}/${metaname}
   fi
 fi
 
diff --git a/jobs/JGEFS_ATMOS_AVGSPR_GEMPAK_META b/jobs/JGEFS_ATMOS_AVGSPR_GEMPAK_META
index 1dbf89c28..30a5a791c 100755
--- a/jobs/JGEFS_ATMOS_AVGSPR_GEMPAK_META
+++ b/jobs/JGEFS_ATMOS_AVGSPR_GEMPAK_META
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! /usr/bin/env bash
 
 echo "$(date -u) begin $(basename $BASH_SOURCE)"
 
@@ -101,7 +101,7 @@ export err=$?
 if [[ $err == 0 ]]; then
   echo "$job completed normally!"
 else
-  echo "FATAL ERROR: $job failed!"
+  echo "FATAL ERROR in $(basename $BASH_SOURCE): $job failed!"
 fi
 #############################################################
 
diff --git a/jobs/JGEFS_ATMOS_GEMPAK_META b/jobs/JGEFS_ATMOS_GEMPAK_META
index 957afb66a..dfabfee06 100755
--- a/jobs/JGEFS_ATMOS_GEMPAK_META
+++ b/jobs/JGEFS_ATMOS_GEMPAK_META
@@ -64,15 +64,6 @@ export PARMgefs=${PARMgefs:-$HOMEgefs/parm}
 export GEMPAKgefs=${GEMPAKgefs:-$HOMEgefs/gempak}
 export FIXgempak=${FIXgempak:-$GEMPAKgefs/fix}
 
-##############################################
-# Define COM directories
-##############################################
-# gefs_meta_qpf.sh overrides COMIN locally to work with datatype.tbl
-ver=${ver:-$(echo ${gefs_ver}|cut -c1-5)}
-export COMIN=${COMIN:-$(compath.py $envir/com/$NET/${ver})/${RUN}.${PDY}/$cyc}
-export COMINs=${COMINs:-$(compath.py $envir/com/$NET/${ver})}
-export COMOUT=${COMOUT:-$(compath.py -o $NET/${ver})/${RUN}.${PDY}/$cyc}
-
 #############################
 # Source relevant config files
 #############################
@@ -95,7 +86,19 @@ export COMINukmet=${COMINukmet:-$(compath.py $envir/com/ukmet/${ukmet_ver})/ukme
 export COMINnam=${COMINnam:-$(compath.py $envir/com/nam/${nam_ver})}
 
 export COMPONENT=${COMPONENT:-atmos}
-if [[ ! -d $COMOUT/$COMPONENT/gempak/meta ]]; then mkdir -p -m 755 $COMOUT/$COMPONENT/gempak/meta; fi
+##############################################
+# Define COM directories
+##############################################
+# gefs_meta_qpf.sh overrides COMIN locally to work with datatype.tbl
+ver=${ver:-$(echo ${gefs_ver}|cut -c1-5)}
+export COMIN=${COMIN:-$(compath.py $envir/com/$NET/${ver})/${RUN}.${PDY}/$cyc}
+export COMINs=${COMINs:-$(compath.py $envir/com/$NET/${ver})}
+if [[ ${NewCOM:-"YES"} == "YES" ]]; then
+  export COMOUT=${COMOUT:-$(compath.py -o $NET/${ver})/${RUN}.${PDY}/${cyc}/avg/$COMPONENT/products/gempak/meta}
+else
+  export COMOUT=${COMOUT:-$(compath.py -o $NET/${ver})/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak/meta}
+fi
+if [[ ! -d $COMOUT ]]; then mkdir -p -m 755 $COMOUT; fi
 
 echo "Environment before calling script"
 env | sort