diff --git a/parm/config/gefs/config.fcst b/parm/config/gefs/config.fcst
index 45600ba59e..a125c96331 100644
--- a/parm/config/gefs/config.fcst
+++ b/parm/config/gefs/config.fcst
@@ -188,17 +188,17 @@ export random_clds=".true."
 case ${imp_physics} in
     99) # ZhaoCarr
         export ncld=1
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_zhaocarr${tbf}${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_zhaocarr${tbf}${tbp}"
         export nwat=2
         ;;
     6)  # WSM6
         export ncld=2
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_wsm6${tbf}${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_wsm6${tbf}${tbp}"
         export nwat=6
         ;;
     8)  # Thompson
         export ncld=2
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_thompson_noaero_tke${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_thompson_noaero_tke${tbp}"
         export nwat=6
 
         export cal_pre=".false."
@@ -221,7 +221,7 @@ case ${imp_physics} in
         ;;
     11) # GFDL
         export ncld=5
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_gfdl${tbf}${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_gfdl${tbf}${tbp}"
         export nwat=6
         export dnats=1
         export cal_pre=".false."
@@ -278,7 +278,7 @@ export deflate_level=1
 export USE_COUPLER_RES="NO"
 
 # Write more variables to output
-export DIAG_TABLE="${HOMEgfs}/parm/parm_fv3diag/diag_table"
+export DIAG_TABLE="${HOMEgfs}/parm/ufs/fv3/diag_table"
 
 # Write gfs restart files to rerun fcst from any break point
 export restart_interval=${restart_interval_gfs:-12}
@@ -299,11 +299,11 @@ else
 fi
 
 if [[ "${DO_AERO}" = "YES" ]]; then # temporary settings for aerosol coupling
-    export AERO_DIAG_TABLE="${AERO_DIAG_TABLE:-${HOMEgfs}/parm/parm_fv3diag/diag_table.aero}"
-    export AERO_FIELD_TABLE="${AERO_FIELD_TABLE:-${HOMEgfs}/parm/parm_fv3diag/field_table.aero}"
+    export AERO_DIAG_TABLE="${AERO_DIAG_TABLE:-${HOMEgfs}/parm/ufs/fv3/diag_table.aero}"
+    export AERO_FIELD_TABLE="${AERO_FIELD_TABLE:-${HOMEgfs}/parm/ufs/fv3/field_table.aero}"
     AERO_EMIS_FIRE="${AERO_EMIS_FIRE:-none}"
     export AERO_EMIS_FIRE=${AERO_EMIS_FIRE,,}
-    export AERO_CONFIG_DIR="${AERO_CONFIG_DIR:-${HOMEgfs}/parm/chem}"
+    export AERO_CONFIG_DIR="${AERO_CONFIG_DIR:-${HOMEgfs}/parm/ufs/chem}"
     export AERO_INPUTS_DIR="${AERO_INPUTS_DIR:-}"
     export fscav_aero="${aero_conv_scav_factors:-${fscav_aero}}"
     export dnats_aero="${aero_diag_tracers:-0}"
diff --git a/parm/config/gfs/config.aero b/parm/config/gfs/config.aero
index 2eb674af3f..fbd2d86ac8 100644
--- a/parm/config/gfs/config.aero
+++ b/parm/config/gfs/config.aero
@@ -5,8 +5,8 @@
 # Turn off warnings about unused variables
 # shellcheck disable=SC2034
 
-# Directory containing GOCART configuration files. Defaults to parm/chem if unset.
-AERO_CONFIG_DIR=${HOMEgfs}/parm/chem
+# Directory containing GOCART configuration files. Defaults to parm/ufs/chem if unset.
+AERO_CONFIG_DIR=${HOMEgfs}/parm/ufs/chem
 
 # Path to the input data tree
 case ${machine} in
diff --git a/parm/config/gfs/config.efcs b/parm/config/gfs/config.efcs
index 534daf470c..1af7bd949d 100644
--- a/parm/config/gfs/config.efcs
+++ b/parm/config/gfs/config.efcs
@@ -72,9 +72,9 @@ export SPPT_LOGIT=".true."
 export SPPT_SFCLIMIT=".true."
 
 if [[ "${QUILTING}" = ".true." ]] && [[ "${OUTPUT_GRID}" = "gaussian_grid" ]]; then
-    export DIAG_TABLE="${HOMEgfs}/parm/parm_fv3diag/diag_table_da"
+    export DIAG_TABLE="${HOMEgfs}/parm/ufs/fv3/diag_table_da"
 else
-    export DIAG_TABLE="${HOMEgfs}/parm/parm_fv3diag/diag_table_da_orig"
+    export DIAG_TABLE="${HOMEgfs}/parm/ufs/fv3/diag_table_da_orig"
 fi
 
 # For IAU, write restarts at beginning of window also
diff --git a/parm/config/gfs/config.fcst b/parm/config/gfs/config.fcst
index 759c0336c0..5202a90731 100644
--- a/parm/config/gfs/config.fcst
+++ b/parm/config/gfs/config.fcst
@@ -188,17 +188,17 @@ export random_clds=".true."
 case ${imp_physics} in
     99) # ZhaoCarr
         export ncld=1
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_zhaocarr${tbf}${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_zhaocarr${tbf}${tbp}"
         export nwat=2
         ;;
     6)  # WSM6
         export ncld=2
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_wsm6${tbf}${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_wsm6${tbf}${tbp}"
         export nwat=6
         ;;
     8)  # Thompson
         export ncld=2
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_thompson_noaero_tke${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_thompson_noaero_tke${tbp}"
         export nwat=6
 
         export cal_pre=".false."
@@ -221,7 +221,7 @@ case ${imp_physics} in
         ;;
     11) # GFDL
         export ncld=5
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_gfdl${tbf}${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_gfdl${tbf}${tbp}"
         export nwat=6
         export dnats=1
         export cal_pre=".false."
@@ -280,7 +280,7 @@ export USE_COUPLER_RES="NO"
 if [[ "${CDUMP}" =~ "gdas" ]] ; then # GDAS cycle specific parameters
 
     # Variables used in DA cycling
-    export DIAG_TABLE="${HOMEgfs}/parm/parm_fv3diag/diag_table_da"
+    export DIAG_TABLE="${HOMEgfs}/parm/ufs/fv3/diag_table_da"
 
 
     if [[ "${DOIAU}" == "YES" ]]; then
@@ -298,7 +298,7 @@ if [[ "${CDUMP}" =~ "gdas" ]] ; then # GDAS cycle specific parameters
 elif [[ "${CDUMP}" =~ "gfs" ]] ; then # GFS cycle specific parameters
 
     # Write more variables to output
-    export DIAG_TABLE="${HOMEgfs}/parm/parm_fv3diag/diag_table"
+    export DIAG_TABLE="${HOMEgfs}/parm/ufs/fv3/diag_table"
 
     # Write gfs restart files to rerun fcst from any break point
     export restart_interval=${restart_interval_gfs:-12}
@@ -321,11 +321,11 @@ elif [[ "${CDUMP}" =~ "gfs" ]] ; then # GFS cycle specific parameters
 fi
 
 if [[ "${DO_AERO}" = "YES" ]]; then # temporary settings for aerosol coupling
-    export AERO_DIAG_TABLE="${AERO_DIAG_TABLE:-${HOMEgfs}/parm/parm_fv3diag/diag_table.aero}"
-    export AERO_FIELD_TABLE="${AERO_FIELD_TABLE:-${HOMEgfs}/parm/parm_fv3diag/field_table.aero}"
+    export AERO_DIAG_TABLE="${AERO_DIAG_TABLE:-${HOMEgfs}/parm/ufs/fv3/diag_table.aero}"
+    export AERO_FIELD_TABLE="${AERO_FIELD_TABLE:-${HOMEgfs}/parm/ufs/fv3/field_table.aero}"
     AERO_EMIS_FIRE="${AERO_EMIS_FIRE:-none}"
     export AERO_EMIS_FIRE=${AERO_EMIS_FIRE,,}
-    export AERO_CONFIG_DIR="${AERO_CONFIG_DIR:-${HOMEgfs}/parm/chem}"
+    export AERO_CONFIG_DIR="${AERO_CONFIG_DIR:-${HOMEgfs}/parm/ufs/chem}"
     export AERO_INPUTS_DIR="${AERO_INPUTS_DIR:-}"
     export fscav_aero="${aero_conv_scav_factors:-${fscav_aero}}"
     export dnats_aero="${aero_diag_tracers:-0}"
diff --git a/parm/chem/AERO.rc b/parm/ufs/chem/AERO.rc
similarity index 100%
rename from parm/chem/AERO.rc
rename to parm/ufs/chem/AERO.rc
diff --git a/parm/chem/AERO_HISTORY.rc b/parm/ufs/chem/AERO_HISTORY.rc
similarity index 100%
rename from parm/chem/AERO_HISTORY.rc
rename to parm/ufs/chem/AERO_HISTORY.rc
diff --git a/parm/chem/AGCM.rc b/parm/ufs/chem/AGCM.rc
similarity index 100%
rename from parm/chem/AGCM.rc
rename to parm/ufs/chem/AGCM.rc
diff --git a/parm/chem/CA2G_instance_CA.bc.rc b/parm/ufs/chem/CA2G_instance_CA.bc.rc
similarity index 100%
rename from parm/chem/CA2G_instance_CA.bc.rc
rename to parm/ufs/chem/CA2G_instance_CA.bc.rc
diff --git a/parm/chem/CA2G_instance_CA.br.rc b/parm/ufs/chem/CA2G_instance_CA.br.rc
similarity index 100%
rename from parm/chem/CA2G_instance_CA.br.rc
rename to parm/ufs/chem/CA2G_instance_CA.br.rc
diff --git a/parm/chem/CA2G_instance_CA.oc.rc b/parm/ufs/chem/CA2G_instance_CA.oc.rc
similarity index 100%
rename from parm/chem/CA2G_instance_CA.oc.rc
rename to parm/ufs/chem/CA2G_instance_CA.oc.rc
diff --git a/parm/chem/CAP.rc b/parm/ufs/chem/CAP.rc
similarity index 100%
rename from parm/chem/CAP.rc
rename to parm/ufs/chem/CAP.rc
diff --git a/parm/chem/DU2G_instance_DU.rc b/parm/ufs/chem/DU2G_instance_DU.rc
similarity index 100%
rename from parm/chem/DU2G_instance_DU.rc
rename to parm/ufs/chem/DU2G_instance_DU.rc
diff --git a/parm/chem/ExtData.gbbepx b/parm/ufs/chem/ExtData.gbbepx
similarity index 100%
rename from parm/chem/ExtData.gbbepx
rename to parm/ufs/chem/ExtData.gbbepx
diff --git a/parm/chem/ExtData.none b/parm/ufs/chem/ExtData.none
similarity index 100%
rename from parm/chem/ExtData.none
rename to parm/ufs/chem/ExtData.none
diff --git a/parm/chem/ExtData.other b/parm/ufs/chem/ExtData.other
similarity index 100%
rename from parm/chem/ExtData.other
rename to parm/ufs/chem/ExtData.other
diff --git a/parm/chem/ExtData.qfed b/parm/ufs/chem/ExtData.qfed
similarity index 100%
rename from parm/chem/ExtData.qfed
rename to parm/ufs/chem/ExtData.qfed
diff --git a/parm/chem/GOCART2G_GridComp.rc b/parm/ufs/chem/GOCART2G_GridComp.rc
similarity index 100%
rename from parm/chem/GOCART2G_GridComp.rc
rename to parm/ufs/chem/GOCART2G_GridComp.rc
diff --git a/parm/chem/NI2G_instance_NI.rc b/parm/ufs/chem/NI2G_instance_NI.rc
similarity index 100%
rename from parm/chem/NI2G_instance_NI.rc
rename to parm/ufs/chem/NI2G_instance_NI.rc
diff --git a/parm/chem/SS2G_instance_SS.rc b/parm/ufs/chem/SS2G_instance_SS.rc
similarity index 100%
rename from parm/chem/SS2G_instance_SS.rc
rename to parm/ufs/chem/SS2G_instance_SS.rc
diff --git a/parm/chem/SU2G_instance_SU.rc b/parm/ufs/chem/SU2G_instance_SU.rc
similarity index 100%
rename from parm/chem/SU2G_instance_SU.rc
rename to parm/ufs/chem/SU2G_instance_SU.rc
diff --git a/parm/chem/gocart_tracer.list b/parm/ufs/chem/gocart_tracer.list
similarity index 100%
rename from parm/chem/gocart_tracer.list
rename to parm/ufs/chem/gocart_tracer.list
diff --git a/parm/parm_fv3diag/data_table b/parm/ufs/fv3/data_table
similarity index 100%
rename from parm/parm_fv3diag/data_table
rename to parm/ufs/fv3/data_table
diff --git a/parm/parm_fv3diag/diag_table b/parm/ufs/fv3/diag_table
similarity index 100%
rename from parm/parm_fv3diag/diag_table
rename to parm/ufs/fv3/diag_table
diff --git a/parm/parm_fv3diag/diag_table.aero b/parm/ufs/fv3/diag_table.aero
similarity index 100%
rename from parm/parm_fv3diag/diag_table.aero
rename to parm/ufs/fv3/diag_table.aero
diff --git a/parm/parm_fv3diag/diag_table_aod b/parm/ufs/fv3/diag_table_aod
similarity index 100%
rename from parm/parm_fv3diag/diag_table_aod
rename to parm/ufs/fv3/diag_table_aod
diff --git a/parm/parm_fv3diag/diag_table_da b/parm/ufs/fv3/diag_table_da
similarity index 100%
rename from parm/parm_fv3diag/diag_table_da
rename to parm/ufs/fv3/diag_table_da
diff --git a/parm/parm_fv3diag/diag_table_da_orig b/parm/ufs/fv3/diag_table_da_orig
similarity index 100%
rename from parm/parm_fv3diag/diag_table_da_orig
rename to parm/ufs/fv3/diag_table_da_orig
diff --git a/parm/parm_fv3diag/field_table b/parm/ufs/fv3/field_table
similarity index 100%
rename from parm/parm_fv3diag/field_table
rename to parm/ufs/fv3/field_table
diff --git a/parm/parm_fv3diag/field_table.aero b/parm/ufs/fv3/field_table.aero
similarity index 100%
rename from parm/parm_fv3diag/field_table.aero
rename to parm/ufs/fv3/field_table.aero
diff --git a/parm/parm_fv3diag/field_table_gfdl b/parm/ufs/fv3/field_table_gfdl
similarity index 100%
rename from parm/parm_fv3diag/field_table_gfdl
rename to parm/ufs/fv3/field_table_gfdl
diff --git a/parm/parm_fv3diag/field_table_gfdl_progsigma b/parm/ufs/fv3/field_table_gfdl_progsigma
similarity index 100%
rename from parm/parm_fv3diag/field_table_gfdl_progsigma
rename to parm/ufs/fv3/field_table_gfdl_progsigma
diff --git a/parm/parm_fv3diag/field_table_gfdl_satmedmf b/parm/ufs/fv3/field_table_gfdl_satmedmf
similarity index 100%
rename from parm/parm_fv3diag/field_table_gfdl_satmedmf
rename to parm/ufs/fv3/field_table_gfdl_satmedmf
diff --git a/parm/parm_fv3diag/field_table_gfdl_satmedmf_progsigma b/parm/ufs/fv3/field_table_gfdl_satmedmf_progsigma
similarity index 100%
rename from parm/parm_fv3diag/field_table_gfdl_satmedmf_progsigma
rename to parm/ufs/fv3/field_table_gfdl_satmedmf_progsigma
diff --git a/parm/parm_fv3diag/field_table_thompson b/parm/ufs/fv3/field_table_thompson
similarity index 100%
rename from parm/parm_fv3diag/field_table_thompson
rename to parm/ufs/fv3/field_table_thompson
diff --git a/parm/parm_fv3diag/field_table_thompson_aero_tke b/parm/ufs/fv3/field_table_thompson_aero_tke
similarity index 100%
rename from parm/parm_fv3diag/field_table_thompson_aero_tke
rename to parm/ufs/fv3/field_table_thompson_aero_tke
diff --git a/parm/parm_fv3diag/field_table_thompson_noaero_tke b/parm/ufs/fv3/field_table_thompson_noaero_tke
similarity index 100%
rename from parm/parm_fv3diag/field_table_thompson_noaero_tke
rename to parm/ufs/fv3/field_table_thompson_noaero_tke
diff --git a/parm/parm_fv3diag/field_table_thompson_noaero_tke_progsigma b/parm/ufs/fv3/field_table_thompson_noaero_tke_progsigma
similarity index 100%
rename from parm/parm_fv3diag/field_table_thompson_noaero_tke_progsigma
rename to parm/ufs/fv3/field_table_thompson_noaero_tke_progsigma
diff --git a/parm/parm_fv3diag/field_table_thompson_satmedmf b/parm/ufs/fv3/field_table_thompson_satmedmf
similarity index 100%
rename from parm/parm_fv3diag/field_table_thompson_satmedmf
rename to parm/ufs/fv3/field_table_thompson_satmedmf
diff --git a/parm/parm_fv3diag/field_table_wsm6 b/parm/ufs/fv3/field_table_wsm6
similarity index 100%
rename from parm/parm_fv3diag/field_table_wsm6
rename to parm/ufs/fv3/field_table_wsm6
diff --git a/parm/parm_fv3diag/field_table_wsm6_progsigma b/parm/ufs/fv3/field_table_wsm6_progsigma
similarity index 100%
rename from parm/parm_fv3diag/field_table_wsm6_progsigma
rename to parm/ufs/fv3/field_table_wsm6_progsigma
diff --git a/parm/parm_fv3diag/field_table_wsm6_satmedmf b/parm/ufs/fv3/field_table_wsm6_satmedmf
similarity index 100%
rename from parm/parm_fv3diag/field_table_wsm6_satmedmf
rename to parm/ufs/fv3/field_table_wsm6_satmedmf
diff --git a/parm/parm_fv3diag/field_table_wsm6_satmedmf_progsigma b/parm/ufs/fv3/field_table_wsm6_satmedmf_progsigma
similarity index 100%
rename from parm/parm_fv3diag/field_table_wsm6_satmedmf_progsigma
rename to parm/ufs/fv3/field_table_wsm6_satmedmf_progsigma
diff --git a/parm/parm_fv3diag/field_table_zhaocarr b/parm/ufs/fv3/field_table_zhaocarr
similarity index 100%
rename from parm/parm_fv3diag/field_table_zhaocarr
rename to parm/ufs/fv3/field_table_zhaocarr
diff --git a/parm/parm_fv3diag/field_table_zhaocarr_progsigma b/parm/ufs/fv3/field_table_zhaocarr_progsigma
similarity index 100%
rename from parm/parm_fv3diag/field_table_zhaocarr_progsigma
rename to parm/ufs/fv3/field_table_zhaocarr_progsigma
diff --git a/parm/parm_fv3diag/field_table_zhaocarr_satmedmf b/parm/ufs/fv3/field_table_zhaocarr_satmedmf
similarity index 100%
rename from parm/parm_fv3diag/field_table_zhaocarr_satmedmf
rename to parm/ufs/fv3/field_table_zhaocarr_satmedmf
diff --git a/parm/parm_fv3diag/field_table_zhaocarr_satmedmf_progsigma b/parm/ufs/fv3/field_table_zhaocarr_satmedmf_progsigma
similarity index 100%
rename from parm/parm_fv3diag/field_table_zhaocarr_satmedmf_progsigma
rename to parm/ufs/fv3/field_table_zhaocarr_satmedmf_progsigma
diff --git a/parm/parm_fv3diag/variable_table.txt b/parm/ufs/fv3/variable_table.txt
similarity index 100%
rename from parm/parm_fv3diag/variable_table.txt
rename to parm/ufs/fv3/variable_table.txt
diff --git a/parm/parm_fv3diag/variable_table_da.txt b/parm/ufs/fv3/variable_table_da.txt
similarity index 100%
rename from parm/parm_fv3diag/variable_table_da.txt
rename to parm/ufs/fv3/variable_table_da.txt
diff --git a/parm/parm_fv3diag/variable_table_da_nonsst.txt b/parm/ufs/fv3/variable_table_da_nonsst.txt
similarity index 100%
rename from parm/parm_fv3diag/variable_table_da_nonsst.txt
rename to parm/ufs/fv3/variable_table_da_nonsst.txt
diff --git a/parm/mom6/MOM_input_template_025 b/parm/ufs/mom6/MOM_input_template_025
similarity index 100%
rename from parm/mom6/MOM_input_template_025
rename to parm/ufs/mom6/MOM_input_template_025
diff --git a/parm/mom6/MOM_input_template_050 b/parm/ufs/mom6/MOM_input_template_050
similarity index 100%
rename from parm/mom6/MOM_input_template_050
rename to parm/ufs/mom6/MOM_input_template_050
diff --git a/parm/mom6/MOM_input_template_100 b/parm/ufs/mom6/MOM_input_template_100
similarity index 100%
rename from parm/mom6/MOM_input_template_100
rename to parm/ufs/mom6/MOM_input_template_100
diff --git a/parm/mom6/MOM_input_template_500 b/parm/ufs/mom6/MOM_input_template_500
similarity index 100%
rename from parm/mom6/MOM_input_template_500
rename to parm/ufs/mom6/MOM_input_template_500
diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh
index eb881b70bf..ebd3c410a6 100755
--- a/ush/forecast_predet.sh
+++ b/ush/forecast_predet.sh
@@ -61,7 +61,6 @@ common_predet(){
   FIX_DIR=${FIX_DIR:-${HOMEgfs}/fix}
 
   # Model specific stuff
-  PARM_FV3DIAG=${PARM_FV3DIAG:-${HOMEgfs}/parm/parm_fv3diag}
   PARM_POST=${PARM_POST:-${HOMEgfs}/parm/post}
 
   # Define significant cycles
diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh
index dc5e67d7c4..baf81602c2 100755
--- a/ush/parsing_namelists_FV3.sh
+++ b/ush/parsing_namelists_FV3.sh
@@ -12,10 +12,10 @@
 FV3_namelists(){
 
 # setup the tables
-DIAG_TABLE=${DIAG_TABLE:-${PARM_FV3DIAG}/diag_table}
-DIAG_TABLE_APPEND=${DIAG_TABLE_APPEND:-${PARM_FV3DIAG}/diag_table_aod}
-DATA_TABLE=${DATA_TABLE:-${PARM_FV3DIAG}/data_table}
-FIELD_TABLE=${FIELD_TABLE:-${PARM_FV3DIAG}/field_table}
+DIAG_TABLE=${DIAG_TABLE:-${HOMEgfs}/parm/ufs/fv3/diag_table}
+DIAG_TABLE_APPEND=${DIAG_TABLE_APPEND:-${HOMEgfs}/parm/ufs/fv3/diag_table_aod}
+DATA_TABLE=${DATA_TABLE:-${HOMEgfs}/parm/ufs/fv3/data_table}
+FIELD_TABLE=${FIELD_TABLE:-${HOMEgfs}/parm/ufs/fv3/field_table}
 
 # ensure non-prognostic tracers are set
 dnats=${dnats:-0}
diff --git a/ush/parsing_namelists_MOM6.sh b/ush/parsing_namelists_MOM6.sh
index add7090fe7..4dceb845a2 100755
--- a/ush/parsing_namelists_MOM6.sh
+++ b/ush/parsing_namelists_MOM6.sh
@@ -62,7 +62,7 @@ echo "$(cat input.nml)"
 
 
 #Copy MOM_input and edit:
-${NCP} -pf "${HOMEgfs}/parm/mom6/MOM_input_template_${OCNRES}" "${DATA}/INPUT/"
+${NCP} -pf "${HOMEgfs}/parm/ufs/mom6/MOM_input_template_${OCNRES}" "${DATA}/INPUT/"
 sed -e "s/@\[DT_THERM_MOM6\]/${DT_THERM_MOM6}/g" \
     -e "s/@\[DT_DYNAM_MOM6\]/${DT_DYNAM_MOM6}/g" \
     -e "s/@\[MOM6_RIVER_RUNOFF\]/${MOM6_RIVER_RUNOFF}/g" \
@@ -80,7 +80,7 @@ sed -e "s/@\[DT_THERM_MOM6\]/${DT_THERM_MOM6}/g" \
 rm "${DATA}/INPUT/MOM_input_template_${OCNRES}"
 
 #data table for runoff:
-DATA_TABLE=${DATA_TABLE:-${PARM_FV3DIAG}/data_table}
+DATA_TABLE=${DATA_TABLE:-${HOMEgfs}/parm/ufs/fv3/data_table}
 ${NCP} "${DATA_TABLE}" "${DATA}/data_table_template"
 sed -e "s/@\[FRUNOFF\]/${FRUNOFF}/g" "${DATA}/data_table_template" > "${DATA}/data_table"
 rm "${DATA}/data_table_template"