diff --git a/dev/ci/cases/gfsv17/marine3dvar.yaml b/dev/ci/cases/gfsv17/marine3dvar.yaml
index 8149c82199f..76ec3c8f92d 100644
--- a/dev/ci/cases/gfsv17/marine3dvar.yaml
+++ b/dev/ci/cases/gfsv17/marine3dvar.yaml
@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 
 base:
   DOIAU: "YES"
diff --git a/dev/ci/cases/gfsv17/marinehyb.yaml b/dev/ci/cases/gfsv17/marinehyb.yaml
index 012d243df15..b0cf58b4d5f 100644
--- a/dev/ci/cases/gfsv17/marinehyb.yaml
+++ b/dev/ci/cases/gfsv17/marinehyb.yaml
@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 
 base:
   DOIAU: "YES"
diff --git a/dev/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml b/dev/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml
index 4e528e1b829..8cd14335b89 100644
--- a/dev/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml
+++ b/dev/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml
@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_JEDISNOWDA: "YES"
   DO_TEST_MODE: "NO"
diff --git a/dev/ci/cases/yamls/gefs_defaults_ci.yaml b/dev/ci/cases/yamls/gefs_defaults_ci.yaml
index 99733ca821d..3c54a4da1a5 100644
--- a/dev/ci/cases/yamls/gefs_defaults_ci.yaml
+++ b/dev/ci/cases/yamls/gefs_defaults_ci.yaml
@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gefs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gefs/yaml/defaults.yaml
 base:
   SFS_POST: "NO"
   FHOUT_GFS: 6
diff --git a/dev/ci/cases/yamls/gefs_replay_ci.yaml b/dev/ci/cases/yamls/gefs_replay_ci.yaml
index 8bb49f79e3b..ee9421f3fe6 100644
--- a/dev/ci/cases/yamls/gefs_replay_ci.yaml
+++ b/dev/ci/cases/yamls/gefs_replay_ci.yaml
@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gefs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gefs/yaml/defaults.yaml
 base:
   REPLAY_ICS: "YES"
   FCST_BREAKPOINTS: ""
diff --git a/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml b/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml
index e35850ed178..bd1de8fd8ec 100644
--- a/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml
+++ b/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml
@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DOIAU: "YES"
   DO_JEDIATMVAR: "NO"
@@ -18,11 +18,11 @@ base:
   EUPD_CYC: "both"
   INTERVAL_GFS: 6
   SDATE_GFS: 2021122018
-  NMEM_ENS_GFS: 2 
-  NMEM_ENS_GFS_OFFSET: 0 
+  NMEM_ENS_GFS: 2
+  NMEM_ENS_GFS_OFFSET: 0
   DO_TEST_MODE: "NO"
 
 marineanl:
   SOCA_NINNER: 1
 
-  
+
diff --git a/dev/ci/cases/yamls/gfs_defaults_ci.yaml b/dev/ci/cases/yamls/gfs_defaults_ci.yaml
index fcb042e4a9a..f5c0910f61b 100644
--- a/dev/ci/cases/yamls/gfs_defaults_ci.yaml
+++ b/dev/ci/cases/yamls/gfs_defaults_ci.yaml
@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_TEST_MODE: "YES"
   FETCHDIR: "/NCEPDEV/emc-global/1year/David.Grumm/test_data"
diff --git a/dev/ci/cases/yamls/gfs_extended_ci.yaml b/dev/ci/cases/yamls/gfs_extended_ci.yaml
index d7b83a86289..bbf8155ac3f 100644
--- a/dev/ci/cases/yamls/gfs_extended_ci.yaml
+++ b/dev/ci/cases/yamls/gfs_extended_ci.yaml
@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 
 base:
   DO_GOES: "YES"
diff --git a/dev/ci/cases/yamls/gfs_hyb_defaults_ci.yaml b/dev/ci/cases/yamls/gfs_hyb_defaults_ci.yaml
index 6dfad69daaa..9e2afd94b70 100644
--- a/dev/ci/cases/yamls/gfs_hyb_defaults_ci.yaml
+++ b/dev/ci/cases/yamls/gfs_hyb_defaults_ci.yaml
@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_GSISOILDA: "YES"
   DO_TEST_MODE: "YES"
diff --git a/dev/ci/cases/yamls/gfs_metp_ci.yaml b/dev/ci/cases/yamls/gfs_metp_ci.yaml
index 34c79a72119..36ad40cf67a 100644
--- a/dev/ci/cases/yamls/gfs_metp_ci.yaml
+++ b/dev/ci/cases/yamls/gfs_metp_ci.yaml
@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_TEST_MODE: "NO"
   DO_METP: "YES"
diff --git a/dev/ci/cases/yamls/sfs_defaults.yaml b/dev/ci/cases/yamls/sfs_defaults.yaml
index d0a334ff89b..de246b0f809 100644
--- a/dev/ci/cases/yamls/sfs_defaults.yaml
+++ b/dev/ci/cases/yamls/sfs_defaults.yaml
@@ -1,26 +1,13 @@
+defaults:
+  !INC {{ HOMEgfs }}/dev/parm/config/sfs/yaml/defaults.yaml
 base:
-  DO_JEDIATMVAR: "NO"
-  DO_JEDIATMENS: "NO"
-  DO_JEDIOCNVAR: "NO"
-  DO_JEDISNOWDA: "NO"
-  DO_MERGENSST: "NO"
-  DO_BUFRSND: "NO"
-  DO_GEMPAK: "NO"
-  DO_AWIPS: "NO"
-  KEEPDATA: "NO"
-  DO_EXTRACTVARS: "NO"
   FHMAX_GFS: 144
-  FHMAX_HF_GFS: 0
-  FHOUT_HF_GFS: 1
   FHOUT_GFS: 24
   FHOUT_OCN_GFS: 24
   FHOUT_ICE_GFS: 24
   FCST_BREAKPOINTS: "48,96"
-  REPLAY_ICS: "NO"
   USE_OCN_ENS_PERTURB_FILES: "YES"
   USE_ATM_ENS_PERTURB_FILES: "YES"
-  HPSSARCH: "NO"
-  LOCALARCH: "NO"
 fcst:
   TYPE: "hydro"
   MONO: "mono"
diff --git a/dev/ci/cases/yamls/sfs_full.yaml b/dev/ci/cases/yamls/sfs_full.yaml
index 79f5324d0e3..6cf934cabf0 100644
--- a/dev/ci/cases/yamls/sfs_full.yaml
+++ b/dev/ci/cases/yamls/sfs_full.yaml
@@ -1,17 +1,7 @@
+defaults:
+  !INC {{ HOMEgfs }}/dev/parm/config/sfs/yaml/defaults.yaml
 base:
-  DO_JEDIATMVAR: "NO"
-  DO_JEDIATMENS: "NO"
-  DO_JEDIOCNVAR: "NO"
-  DO_JEDISNOWDA: "NO"
-  DO_MERGENSST: "NO"
-  DO_BUFRSND: "NO"
-  DO_GEMPAK: "NO"
-  DO_AWIPS: "NO"
-  KEEPDATA: "NO"
-  DO_EXTRACTVARS: "NO"
   FHMAX_GFS: 2976
-  FHMAX_HF_GFS: 0
-  FHOUT_HF_GFS: 1
   FHOUT_GFS: 24
   FHOUT_OCN_GFS: 24
   FHOUT_ICE_GFS: 24
@@ -19,8 +9,6 @@ base:
   REPLAY_ICS: "NO"
   USE_OCN_ENS_PERTURB_FILES: "YES"
   USE_ATM_ENS_PERTURB_FILES: "YES"
-  HPSSARCH: "NO"
-  LOCALARCH: "NO"
 fcst:
   TYPE: "hydro"
   MONO: "mono"
diff --git a/dev/ci/cases/yamls/soca_gfs_defaults_ci.yaml b/dev/ci/cases/yamls/soca_gfs_defaults_ci.yaml
index e799383e328..8725b61b0df 100644
--- a/dev/ci/cases/yamls/soca_gfs_defaults_ci.yaml
+++ b/dev/ci/cases/yamls/soca_gfs_defaults_ci.yaml
@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_JEDIOCNVAR: "YES"
   DO_METP: "NO"
diff --git a/dev/ci/cases/yamls/soca_hyb_gfs_defaults_ci.yaml b/dev/ci/cases/yamls/soca_hyb_gfs_defaults_ci.yaml
index 773e5016bf3..cab6674c9ad 100644
--- a/dev/ci/cases/yamls/soca_hyb_gfs_defaults_ci.yaml
+++ b/dev/ci/cases/yamls/soca_hyb_gfs_defaults_ci.yaml
@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_JEDIOCNVAR: "YES"
   DOHYBVAR_OCN: "YES"
diff --git a/dev/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml b/dev/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml
index f15c5885b29..f7fa21d4560 100644
--- a/dev/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml
+++ b/dev/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml
@@ -1,5 +1,5 @@
 defaults:
-  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+  !INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml
 base:
   DOIAU: "NO"
   DO_JEDIATMVAR: "YES"
diff --git a/dev/ci/scripts/unittests/test_create_experiment.py b/dev/ci/scripts/unittests/test_create_experiment.py
index db78f59cf66..24f67ca40d3 100644
--- a/dev/ci/scripts/unittests/test_create_experiment.py
+++ b/dev/ci/scripts/unittests/test_create_experiment.py
@@ -23,6 +23,7 @@ def test_create_experiment():
         if case.endswith('.yaml'):
             env['pslot'] = os.path.splitext(case)[0]
             cmd_args = ['-y', f'{yaml_dir}/{case}']
+            print(f"Running create_experiment.py for {case}")
             create_experiment(*cmd_args, env=env)
             if create_experiment.returncode:
                 print(f"FATAL ERROR: Failed to create experiment for {case}")
diff --git a/parm/config/gefs/config.aero.j2 b/dev/parm/config/gefs/config.aero.j2
similarity index 100%
rename from parm/config/gefs/config.aero.j2
rename to dev/parm/config/gefs/config.aero.j2
diff --git a/parm/config/gefs/config.arch_tars b/dev/parm/config/gefs/config.arch_tars
similarity index 100%
rename from parm/config/gefs/config.arch_tars
rename to dev/parm/config/gefs/config.arch_tars
diff --git a/parm/config/gefs/config.arch_vrfy b/dev/parm/config/gefs/config.arch_vrfy
similarity index 100%
rename from parm/config/gefs/config.arch_vrfy
rename to dev/parm/config/gefs/config.arch_vrfy
diff --git a/parm/config/gefs/config.atmos_ensstat b/dev/parm/config/gefs/config.atmos_ensstat
similarity index 100%
rename from parm/config/gefs/config.atmos_ensstat
rename to dev/parm/config/gefs/config.atmos_ensstat
diff --git a/parm/config/gefs/config.atmos_products b/dev/parm/config/gefs/config.atmos_products
similarity index 100%
rename from parm/config/gefs/config.atmos_products
rename to dev/parm/config/gefs/config.atmos_products
diff --git a/parm/config/gefs/config.base.j2 b/dev/parm/config/gefs/config.base.j2
similarity index 100%
rename from parm/config/gefs/config.base.j2
rename to dev/parm/config/gefs/config.base.j2
diff --git a/parm/config/gefs/config.cleanup b/dev/parm/config/gefs/config.cleanup
similarity index 100%
rename from parm/config/gefs/config.cleanup
rename to dev/parm/config/gefs/config.cleanup
diff --git a/parm/config/gefs/config.com b/dev/parm/config/gefs/config.com
similarity index 100%
rename from parm/config/gefs/config.com
rename to dev/parm/config/gefs/config.com
diff --git a/parm/config/gefs/config.efcs b/dev/parm/config/gefs/config.efcs
similarity index 100%
rename from parm/config/gefs/config.efcs
rename to dev/parm/config/gefs/config.efcs
diff --git a/parm/config/gefs/config.extractvars b/dev/parm/config/gefs/config.extractvars
similarity index 100%
rename from parm/config/gefs/config.extractvars
rename to dev/parm/config/gefs/config.extractvars
diff --git a/parm/config/gefs/config.fcst.j2 b/dev/parm/config/gefs/config.fcst.j2
similarity index 100%
rename from parm/config/gefs/config.fcst.j2
rename to dev/parm/config/gefs/config.fcst.j2
diff --git a/parm/config/gefs/config.fetch b/dev/parm/config/gefs/config.fetch
similarity index 100%
rename from parm/config/gefs/config.fetch
rename to dev/parm/config/gefs/config.fetch
diff --git a/parm/config/gefs/config.gempak b/dev/parm/config/gefs/config.gempak
similarity index 100%
rename from parm/config/gefs/config.gempak
rename to dev/parm/config/gefs/config.gempak
diff --git a/parm/config/gefs/config.globus b/dev/parm/config/gefs/config.globus
similarity index 100%
rename from parm/config/gefs/config.globus
rename to dev/parm/config/gefs/config.globus
diff --git a/parm/config/gefs/config.ice b/dev/parm/config/gefs/config.ice
similarity index 100%
rename from parm/config/gefs/config.ice
rename to dev/parm/config/gefs/config.ice
diff --git a/parm/config/gefs/config.nsst b/dev/parm/config/gefs/config.nsst
similarity index 100%
rename from parm/config/gefs/config.nsst
rename to dev/parm/config/gefs/config.nsst
diff --git a/parm/config/gefs/config.oceanice_products b/dev/parm/config/gefs/config.oceanice_products
similarity index 100%
rename from parm/config/gefs/config.oceanice_products
rename to dev/parm/config/gefs/config.oceanice_products
diff --git a/parm/config/gefs/config.ocn.j2 b/dev/parm/config/gefs/config.ocn.j2
similarity index 100%
rename from parm/config/gefs/config.ocn.j2
rename to dev/parm/config/gefs/config.ocn.j2
diff --git a/parm/config/gefs/config.postsnd b/dev/parm/config/gefs/config.postsnd
similarity index 100%
rename from parm/config/gefs/config.postsnd
rename to dev/parm/config/gefs/config.postsnd
diff --git a/parm/config/gefs/config.prep_emissions b/dev/parm/config/gefs/config.prep_emissions
similarity index 100%
rename from parm/config/gefs/config.prep_emissions
rename to dev/parm/config/gefs/config.prep_emissions
diff --git a/parm/config/gefs/config.resources b/dev/parm/config/gefs/config.resources
similarity index 100%
rename from parm/config/gefs/config.resources
rename to dev/parm/config/gefs/config.resources
diff --git a/parm/config/gefs/config.resources.AWSPW b/dev/parm/config/gefs/config.resources.AWSPW
similarity index 100%
rename from parm/config/gefs/config.resources.AWSPW
rename to dev/parm/config/gefs/config.resources.AWSPW
diff --git a/parm/config/gefs/config.resources.AZUREPW b/dev/parm/config/gefs/config.resources.AZUREPW
similarity index 100%
rename from parm/config/gefs/config.resources.AZUREPW
rename to dev/parm/config/gefs/config.resources.AZUREPW
diff --git a/parm/config/gefs/config.resources.GAEAC5 b/dev/parm/config/gefs/config.resources.GAEAC5
similarity index 100%
rename from parm/config/gefs/config.resources.GAEAC5
rename to dev/parm/config/gefs/config.resources.GAEAC5
diff --git a/parm/config/gefs/config.resources.GAEAC6 b/dev/parm/config/gefs/config.resources.GAEAC6
similarity index 100%
rename from parm/config/gefs/config.resources.GAEAC6
rename to dev/parm/config/gefs/config.resources.GAEAC6
diff --git a/parm/config/gefs/config.resources.GOOGLEPW b/dev/parm/config/gefs/config.resources.GOOGLEPW
similarity index 100%
rename from parm/config/gefs/config.resources.GOOGLEPW
rename to dev/parm/config/gefs/config.resources.GOOGLEPW
diff --git a/parm/config/gefs/config.stage_ic.j2 b/dev/parm/config/gefs/config.stage_ic.j2
similarity index 100%
rename from parm/config/gefs/config.stage_ic.j2
rename to dev/parm/config/gefs/config.stage_ic.j2
diff --git a/parm/config/gefs/config.ufs b/dev/parm/config/gefs/config.ufs
similarity index 100%
rename from parm/config/gefs/config.ufs
rename to dev/parm/config/gefs/config.ufs
diff --git a/parm/config/gefs/config.wave b/dev/parm/config/gefs/config.wave
similarity index 100%
rename from parm/config/gefs/config.wave
rename to dev/parm/config/gefs/config.wave
diff --git a/parm/config/gefs/config.waveinit b/dev/parm/config/gefs/config.waveinit
similarity index 100%
rename from parm/config/gefs/config.waveinit
rename to dev/parm/config/gefs/config.waveinit
diff --git a/parm/config/gefs/config.wavepostbndpnt b/dev/parm/config/gefs/config.wavepostbndpnt
similarity index 100%
rename from parm/config/gefs/config.wavepostbndpnt
rename to dev/parm/config/gefs/config.wavepostbndpnt
diff --git a/parm/config/gefs/config.wavepostbndpntbll b/dev/parm/config/gefs/config.wavepostbndpntbll
similarity index 100%
rename from parm/config/gefs/config.wavepostbndpntbll
rename to dev/parm/config/gefs/config.wavepostbndpntbll
diff --git a/parm/config/gefs/config.wavepostpnt b/dev/parm/config/gefs/config.wavepostpnt
similarity index 100%
rename from parm/config/gefs/config.wavepostpnt
rename to dev/parm/config/gefs/config.wavepostpnt
diff --git a/parm/config/gefs/config.wavepostsbs b/dev/parm/config/gefs/config.wavepostsbs
similarity index 100%
rename from parm/config/gefs/config.wavepostsbs
rename to dev/parm/config/gefs/config.wavepostsbs
diff --git a/parm/config/gefs/yaml/defaults.yaml b/dev/parm/config/gefs/yaml/defaults.yaml
similarity index 100%
rename from parm/config/gefs/yaml/defaults.yaml
rename to dev/parm/config/gefs/yaml/defaults.yaml
diff --git a/parm/config/gfs/config.aero.j2 b/dev/parm/config/gfs/config.aero.j2
similarity index 100%
rename from parm/config/gfs/config.aero.j2
rename to dev/parm/config/gfs/config.aero.j2
diff --git a/parm/config/gfs/config.aeroanl.j2 b/dev/parm/config/gfs/config.aeroanl.j2
similarity index 100%
rename from parm/config/gfs/config.aeroanl.j2
rename to dev/parm/config/gfs/config.aeroanl.j2
diff --git a/parm/config/gfs/config.aeroanlfinal b/dev/parm/config/gfs/config.aeroanlfinal
similarity index 100%
rename from parm/config/gfs/config.aeroanlfinal
rename to dev/parm/config/gfs/config.aeroanlfinal
diff --git a/parm/config/gfs/config.aeroanlgenb b/dev/parm/config/gfs/config.aeroanlgenb
similarity index 100%
rename from parm/config/gfs/config.aeroanlgenb
rename to dev/parm/config/gfs/config.aeroanlgenb
diff --git a/parm/config/gfs/config.aeroanlinit b/dev/parm/config/gfs/config.aeroanlinit
similarity index 100%
rename from parm/config/gfs/config.aeroanlinit
rename to dev/parm/config/gfs/config.aeroanlinit
diff --git a/parm/config/gfs/config.aeroanlvar b/dev/parm/config/gfs/config.aeroanlvar
similarity index 100%
rename from parm/config/gfs/config.aeroanlvar
rename to dev/parm/config/gfs/config.aeroanlvar
diff --git a/parm/config/gfs/config.aerosol_init b/dev/parm/config/gfs/config.aerosol_init
similarity index 76%
rename from parm/config/gfs/config.aerosol_init
rename to dev/parm/config/gfs/config.aerosol_init
index 0e586e02315..a1acecebff2 100644
--- a/parm/config/gfs/config.aerosol_init
+++ b/dev/parm/config/gfs/config.aerosol_init
@@ -5,6 +5,6 @@
 echo "BEGIN: config.aerosol_init"
 
 # Get task specific resources
-source $EXPDIR/config.resources aerosol_init
+source "${EXPDIR}/config.resources" aerosol_init
 
 echo "END: config.aerosol_init"
\ No newline at end of file
diff --git a/parm/config/gfs/config.anal b/dev/parm/config/gfs/config.anal
similarity index 98%
rename from parm/config/gfs/config.anal
rename to dev/parm/config/gfs/config.anal
index 671fbc98841..07548c867f1 100644
--- a/parm/config/gfs/config.anal
+++ b/dev/parm/config/gfs/config.anal
@@ -6,10 +6,10 @@
 echo "BEGIN: config.anal"
 
 # Get task specific resources
-. ${EXPDIR}/config.resources anal
+source "${EXPDIR}/config.resources" anal
 
 if [[ ${DONST} = "YES" ]]; then
-  . ${EXPDIR}/config.nsst
+  source "${EXPDIR}/config.nsst"
 fi
 
 if [[ "${RUN}" == "gfs" ]] ; then
diff --git a/parm/config/gfs/config.analcalc b/dev/parm/config/gfs/config.analcalc
similarity index 80%
rename from parm/config/gfs/config.analcalc
rename to dev/parm/config/gfs/config.analcalc
index d9501503f00..d01c1653ef7 100644
--- a/parm/config/gfs/config.analcalc
+++ b/dev/parm/config/gfs/config.analcalc
@@ -6,6 +6,6 @@
 echo "BEGIN: config.analcalc"
 
 # Get task specific resources
-. ${EXPDIR}/config.resources analcalc
+source "${EXPDIR}/config.resources" analcalc
 
 echo "END: config.analcalc"
diff --git a/parm/config/gfs/config.analcalc_fv3jedi b/dev/parm/config/gfs/config.analcalc_fv3jedi
similarity index 100%
rename from parm/config/gfs/config.analcalc_fv3jedi
rename to dev/parm/config/gfs/config.analcalc_fv3jedi
diff --git a/parm/config/gfs/config.analdiag b/dev/parm/config/gfs/config.analdiag
similarity index 80%
rename from parm/config/gfs/config.analdiag
rename to dev/parm/config/gfs/config.analdiag
index 7b128d3bad5..71ec3bd89c4 100644
--- a/parm/config/gfs/config.analdiag
+++ b/dev/parm/config/gfs/config.analdiag
@@ -6,6 +6,6 @@
 echo "BEGIN: config.analdiag"
 
 # Get task specific resources
-. $EXPDIR/config.resources analdiag
+source "${EXPDIR}/config.resources" analdiag
 
 echo "END: config.analdiag"
diff --git a/parm/config/gfs/config.anlstat b/dev/parm/config/gfs/config.anlstat
similarity index 85%
rename from parm/config/gfs/config.anlstat
rename to dev/parm/config/gfs/config.anlstat
index 3293c3376ae..7a5b516baaf 100644
--- a/parm/config/gfs/config.anlstat
+++ b/dev/parm/config/gfs/config.anlstat
@@ -9,7 +9,7 @@ echo "BEGIN: config.anlstat"
 source "${EXPDIR}/config.resources" anlstat
 
 export JEDI_CONFIG_YAML="${PARMgfs}/gdas/anlstat_jedi_config.yaml.j2"
-export STAT_BASE_CONFIG_YAML="${PARMgfs}/config/gfs/yaml/stat_base_config.yaml.j2"
+export STAT_BASE_CONFIG_YAML="${PARMgfs}/gdas/stat_base_config.yaml.j2"
 export JCB_BASE_YAML="${PARMgfs}/gdas/stat/aero/jcb-base.yaml.j2"
 export JCB_ALGO_YAML="${PARMgfs}/gdas/jcb-algorithms/anlstat.yaml.j2"
 export JEDIEXE="${HOMEgfs}/sorc/gdas.cd/build/bin/ioda-stats.x"
diff --git a/parm/config/gfs/config.arch_tars b/dev/parm/config/gfs/config.arch_tars
similarity index 100%
rename from parm/config/gfs/config.arch_tars
rename to dev/parm/config/gfs/config.arch_tars
diff --git a/parm/config/gfs/config.arch_vrfy b/dev/parm/config/gfs/config.arch_vrfy
similarity index 100%
rename from parm/config/gfs/config.arch_vrfy
rename to dev/parm/config/gfs/config.arch_vrfy
diff --git a/parm/config/gfs/config.atmanl.j2 b/dev/parm/config/gfs/config.atmanl.j2
similarity index 100%
rename from parm/config/gfs/config.atmanl.j2
rename to dev/parm/config/gfs/config.atmanl.j2
diff --git a/parm/config/gfs/config.atmanlfinal b/dev/parm/config/gfs/config.atmanlfinal
similarity index 100%
rename from parm/config/gfs/config.atmanlfinal
rename to dev/parm/config/gfs/config.atmanlfinal
diff --git a/parm/config/gfs/config.atmanlfv3inc b/dev/parm/config/gfs/config.atmanlfv3inc
similarity index 100%
rename from parm/config/gfs/config.atmanlfv3inc
rename to dev/parm/config/gfs/config.atmanlfv3inc
diff --git a/parm/config/gfs/config.atmanlinit b/dev/parm/config/gfs/config.atmanlinit
similarity index 100%
rename from parm/config/gfs/config.atmanlinit
rename to dev/parm/config/gfs/config.atmanlinit
diff --git a/parm/config/gfs/config.atmanlvar b/dev/parm/config/gfs/config.atmanlvar
similarity index 100%
rename from parm/config/gfs/config.atmanlvar
rename to dev/parm/config/gfs/config.atmanlvar
diff --git a/parm/config/gfs/config.atmensanl.j2 b/dev/parm/config/gfs/config.atmensanl.j2
similarity index 100%
rename from parm/config/gfs/config.atmensanl.j2
rename to dev/parm/config/gfs/config.atmensanl.j2
diff --git a/parm/config/gfs/config.atmensanlfinal b/dev/parm/config/gfs/config.atmensanlfinal
similarity index 100%
rename from parm/config/gfs/config.atmensanlfinal
rename to dev/parm/config/gfs/config.atmensanlfinal
diff --git a/parm/config/gfs/config.atmensanlfv3inc b/dev/parm/config/gfs/config.atmensanlfv3inc
similarity index 100%
rename from parm/config/gfs/config.atmensanlfv3inc
rename to dev/parm/config/gfs/config.atmensanlfv3inc
diff --git a/parm/config/gfs/config.atmensanlinit b/dev/parm/config/gfs/config.atmensanlinit
similarity index 100%
rename from parm/config/gfs/config.atmensanlinit
rename to dev/parm/config/gfs/config.atmensanlinit
diff --git a/parm/config/gfs/config.atmensanlletkf b/dev/parm/config/gfs/config.atmensanlletkf
similarity index 100%
rename from parm/config/gfs/config.atmensanlletkf
rename to dev/parm/config/gfs/config.atmensanlletkf
diff --git a/parm/config/gfs/config.atmensanlobs b/dev/parm/config/gfs/config.atmensanlobs
similarity index 100%
rename from parm/config/gfs/config.atmensanlobs
rename to dev/parm/config/gfs/config.atmensanlobs
diff --git a/parm/config/gfs/config.atmensanlsol b/dev/parm/config/gfs/config.atmensanlsol
similarity index 100%
rename from parm/config/gfs/config.atmensanlsol
rename to dev/parm/config/gfs/config.atmensanlsol
diff --git a/parm/config/gfs/config.atmos_products b/dev/parm/config/gfs/config.atmos_products
similarity index 100%
rename from parm/config/gfs/config.atmos_products
rename to dev/parm/config/gfs/config.atmos_products
diff --git a/parm/config/gfs/config.awips b/dev/parm/config/gfs/config.awips
similarity index 100%
rename from parm/config/gfs/config.awips
rename to dev/parm/config/gfs/config.awips
diff --git a/parm/config/gfs/config.base.j2 b/dev/parm/config/gfs/config.base.j2
similarity index 100%
rename from parm/config/gfs/config.base.j2
rename to dev/parm/config/gfs/config.base.j2
diff --git a/parm/config/gfs/config.cleanup b/dev/parm/config/gfs/config.cleanup
similarity index 100%
rename from parm/config/gfs/config.cleanup
rename to dev/parm/config/gfs/config.cleanup
diff --git a/parm/config/gfs/config.com b/dev/parm/config/gfs/config.com
similarity index 100%
rename from parm/config/gfs/config.com
rename to dev/parm/config/gfs/config.com
diff --git a/parm/config/gfs/config.earc_groups b/dev/parm/config/gfs/config.earc_groups
similarity index 100%
rename from parm/config/gfs/config.earc_groups
rename to dev/parm/config/gfs/config.earc_groups
diff --git a/parm/config/gfs/config.earc_tars b/dev/parm/config/gfs/config.earc_tars
similarity index 100%
rename from parm/config/gfs/config.earc_tars
rename to dev/parm/config/gfs/config.earc_tars
diff --git a/parm/config/gfs/config.earc_vrfy b/dev/parm/config/gfs/config.earc_vrfy
similarity index 100%
rename from parm/config/gfs/config.earc_vrfy
rename to dev/parm/config/gfs/config.earc_vrfy
diff --git a/parm/config/gfs/config.ecen b/dev/parm/config/gfs/config.ecen
similarity index 65%
rename from parm/config/gfs/config.ecen
rename to dev/parm/config/gfs/config.ecen
index 2b686c6b481..933ccbd9060 100644
--- a/parm/config/gfs/config.ecen
+++ b/dev/parm/config/gfs/config.ecen
@@ -6,16 +6,17 @@
 echo "BEGIN: config.ecen"
 
 # Get task specific resources
-. $EXPDIR/config.resources ecen
+source "${EXPDIR}/config.resources" ecen
 
 # Number of concurrent ecen jobs [1 implies sequential]
 # Usually IAUFHRS_ENKF=3,6,9, so NECENGRP=3.  Scripting
 # below queries IAUFHRS_ENKF to determine NECENGRP
 export NECENGRP=1
-if [ $DOIAU_ENKF = "YES" ]; then
-   ngrps=$(grep -o ',' <<<"$IAUFHRS_ENKF" | grep -c .)
+if [[ ${DOIAU_ENKF} = "YES" ]]; then
+   # shellcheck disable=SC2312
+   ngrps=$(grep -o ',' <<<"${IAUFHRS_ENKF}" | grep -c .)
    ((ngrps++))
-   export NECENGRP=$ngrps
+   export NECENGRP=${ngrps}
 fi
 
 echo "END: config.ecen"
diff --git a/parm/config/gfs/config.ecen_fv3jedi b/dev/parm/config/gfs/config.ecen_fv3jedi
similarity index 100%
rename from parm/config/gfs/config.ecen_fv3jedi
rename to dev/parm/config/gfs/config.ecen_fv3jedi
diff --git a/parm/config/gfs/config.echgres b/dev/parm/config/gfs/config.echgres
similarity index 83%
rename from parm/config/gfs/config.echgres
rename to dev/parm/config/gfs/config.echgres
index 478c6b4bcf0..bb552d5c01d 100644
--- a/parm/config/gfs/config.echgres
+++ b/dev/parm/config/gfs/config.echgres
@@ -6,6 +6,6 @@
 echo "BEGIN: config.echgres"
 
 # Get task specific resources
-. $EXPDIR/config.resources echgres
+source "${EXPDIR}/config.resources" echgres
 
 echo "END: config.echgres"
diff --git a/parm/config/gfs/config.ediag b/dev/parm/config/gfs/config.ediag
similarity index 80%
rename from parm/config/gfs/config.ediag
rename to dev/parm/config/gfs/config.ediag
index 12b142088db..b31cf27dd01 100644
--- a/parm/config/gfs/config.ediag
+++ b/dev/parm/config/gfs/config.ediag
@@ -6,6 +6,6 @@
 echo "BEGIN: config.ediag"
 
 # Get task specific resources
-. $EXPDIR/config.resources ediag
+source "${EXPDIR}/config.resources" ediag
 
 echo "END: config.ediag"
diff --git a/parm/config/gfs/config.efcs b/dev/parm/config/gfs/config.efcs
similarity index 100%
rename from parm/config/gfs/config.efcs
rename to dev/parm/config/gfs/config.efcs
diff --git a/parm/config/gfs/config.eobs b/dev/parm/config/gfs/config.eobs
similarity index 95%
rename from parm/config/gfs/config.eobs
rename to dev/parm/config/gfs/config.eobs
index c65d1cefa58..0af01710e9b 100644
--- a/parm/config/gfs/config.eobs
+++ b/dev/parm/config/gfs/config.eobs
@@ -6,7 +6,7 @@
 echo "BEGIN: config.eobs"
 
 # Get task specific resources
-. $EXPDIR/config.resources eobs
+source "${EXPDIR}/config.resources" eobs
 
 
 # GSI namelist options related to observer for EnKF
diff --git a/parm/config/gfs/config.epos b/dev/parm/config/gfs/config.epos
similarity index 76%
rename from parm/config/gfs/config.epos
rename to dev/parm/config/gfs/config.epos
index f1da929b626..0403e941f15 100644
--- a/parm/config/gfs/config.epos
+++ b/dev/parm/config/gfs/config.epos
@@ -6,11 +6,11 @@
 echo "BEGIN: config.epos"
 
 # Get task specific resources
-. $EXPDIR/config.resources epos
+source "${EXPDIR}/config.resources" epos
 
 # No. of concurrent epos jobs [1 implies sequential]
 export NEPOSGRP=7
-if [ $l4densvar = ".false." ]; then
+if [[ "${l4densvar}" == ".false." ]]; then
     export NEPOSGRP=3
 fi
 
diff --git a/parm/config/gfs/config.esfc b/dev/parm/config/gfs/config.esfc
similarity index 95%
rename from parm/config/gfs/config.esfc
rename to dev/parm/config/gfs/config.esfc
index c74c425b757..0d0c2ca0715 100644
--- a/parm/config/gfs/config.esfc
+++ b/dev/parm/config/gfs/config.esfc
@@ -6,7 +6,7 @@
 echo "BEGIN: config.esfc"
 
 # Get task specific resources
-. $EXPDIR/config.resources esfc
+source "${EXPDIR}/config.resources" esfc
 
 # With IAU only need surface analysis at start of IAU window.
 # Set DOSFCANL_ENKF=NO to prevent creation of sfcanl at 
diff --git a/parm/config/gfs/config.esnowanl.j2 b/dev/parm/config/gfs/config.esnowanl.j2
similarity index 100%
rename from parm/config/gfs/config.esnowanl.j2
rename to dev/parm/config/gfs/config.esnowanl.j2
diff --git a/parm/config/gfs/config.eupd b/dev/parm/config/gfs/config.eupd
similarity index 97%
rename from parm/config/gfs/config.eupd
rename to dev/parm/config/gfs/config.eupd
index 7b0c8994c2a..d6f22b79f4f 100644
--- a/parm/config/gfs/config.eupd
+++ b/dev/parm/config/gfs/config.eupd
@@ -6,7 +6,7 @@
 echo "BEGIN: config.eupd"
 
 # Get task specific resources
-. $EXPDIR/config.resources eupd
+source "${EXPDIR}/config.resources" eupd
 
 export ntasks_enkf=${ntasks}
 
diff --git a/parm/config/gfs/config.fbwind b/dev/parm/config/gfs/config.fbwind
similarity index 100%
rename from parm/config/gfs/config.fbwind
rename to dev/parm/config/gfs/config.fbwind
diff --git a/parm/config/gfs/config.fcst b/dev/parm/config/gfs/config.fcst
similarity index 100%
rename from parm/config/gfs/config.fcst
rename to dev/parm/config/gfs/config.fcst
diff --git a/parm/config/gfs/config.fetch b/dev/parm/config/gfs/config.fetch
similarity index 100%
rename from parm/config/gfs/config.fetch
rename to dev/parm/config/gfs/config.fetch
diff --git a/parm/config/gfs/config.fit2obs b/dev/parm/config/gfs/config.fit2obs
similarity index 100%
rename from parm/config/gfs/config.fit2obs
rename to dev/parm/config/gfs/config.fit2obs
diff --git a/parm/config/gfs/config.gempak b/dev/parm/config/gfs/config.gempak
similarity index 100%
rename from parm/config/gfs/config.gempak
rename to dev/parm/config/gfs/config.gempak
diff --git a/parm/config/gfs/config.genesis b/dev/parm/config/gfs/config.genesis
similarity index 100%
rename from parm/config/gfs/config.genesis
rename to dev/parm/config/gfs/config.genesis
diff --git a/parm/config/gfs/config.genesis_fsu b/dev/parm/config/gfs/config.genesis_fsu
similarity index 100%
rename from parm/config/gfs/config.genesis_fsu
rename to dev/parm/config/gfs/config.genesis_fsu
diff --git a/parm/config/gfs/config.globus b/dev/parm/config/gfs/config.globus
similarity index 100%
rename from parm/config/gfs/config.globus
rename to dev/parm/config/gfs/config.globus
diff --git a/parm/config/gfs/config.ice b/dev/parm/config/gfs/config.ice
similarity index 100%
rename from parm/config/gfs/config.ice
rename to dev/parm/config/gfs/config.ice
diff --git a/parm/config/gfs/config.marineanl.j2 b/dev/parm/config/gfs/config.marineanl.j2
similarity index 100%
rename from parm/config/gfs/config.marineanl.j2
rename to dev/parm/config/gfs/config.marineanl.j2
diff --git a/parm/config/gfs/config.marineanlchkpt b/dev/parm/config/gfs/config.marineanlchkpt
similarity index 100%
rename from parm/config/gfs/config.marineanlchkpt
rename to dev/parm/config/gfs/config.marineanlchkpt
diff --git a/parm/config/gfs/config.marineanlfinal b/dev/parm/config/gfs/config.marineanlfinal
similarity index 100%
rename from parm/config/gfs/config.marineanlfinal
rename to dev/parm/config/gfs/config.marineanlfinal
diff --git a/parm/config/gfs/config.marineanlinit b/dev/parm/config/gfs/config.marineanlinit
similarity index 100%
rename from parm/config/gfs/config.marineanlinit
rename to dev/parm/config/gfs/config.marineanlinit
diff --git a/parm/config/gfs/config.marineanlletkf b/dev/parm/config/gfs/config.marineanlletkf
similarity index 100%
rename from parm/config/gfs/config.marineanlletkf
rename to dev/parm/config/gfs/config.marineanlletkf
diff --git a/parm/config/gfs/config.marineanlvar b/dev/parm/config/gfs/config.marineanlvar
similarity index 100%
rename from parm/config/gfs/config.marineanlvar
rename to dev/parm/config/gfs/config.marineanlvar
diff --git a/parm/config/gfs/config.marinebmat b/dev/parm/config/gfs/config.marinebmat
similarity index 100%
rename from parm/config/gfs/config.marinebmat
rename to dev/parm/config/gfs/config.marinebmat
diff --git a/parm/config/gfs/config.metp b/dev/parm/config/gfs/config.metp
similarity index 100%
rename from parm/config/gfs/config.metp
rename to dev/parm/config/gfs/config.metp
diff --git a/parm/config/gfs/config.npoess b/dev/parm/config/gfs/config.npoess
similarity index 100%
rename from parm/config/gfs/config.npoess
rename to dev/parm/config/gfs/config.npoess
diff --git a/parm/config/gfs/config.nsst b/dev/parm/config/gfs/config.nsst
similarity index 100%
rename from parm/config/gfs/config.nsst
rename to dev/parm/config/gfs/config.nsst
diff --git a/parm/config/gfs/config.oceanice_products b/dev/parm/config/gfs/config.oceanice_products
similarity index 100%
rename from parm/config/gfs/config.oceanice_products
rename to dev/parm/config/gfs/config.oceanice_products
diff --git a/parm/config/gfs/config.ocn.j2 b/dev/parm/config/gfs/config.ocn.j2
similarity index 100%
rename from parm/config/gfs/config.ocn.j2
rename to dev/parm/config/gfs/config.ocn.j2
diff --git a/parm/config/gfs/config.ocnanalecen b/dev/parm/config/gfs/config.ocnanalecen
similarity index 100%
rename from parm/config/gfs/config.ocnanalecen
rename to dev/parm/config/gfs/config.ocnanalecen
diff --git a/parm/config/gfs/config.postsnd b/dev/parm/config/gfs/config.postsnd
similarity index 62%
rename from parm/config/gfs/config.postsnd
rename to dev/parm/config/gfs/config.postsnd
index 7ec0ad63215..8a2ef05509a 100644
--- a/parm/config/gfs/config.postsnd
+++ b/dev/parm/config/gfs/config.postsnd
@@ -6,9 +6,9 @@
 echo "BEGIN: config.postsnd"
 
 # Get task specific resources
-. $EXPDIR/config.resources postsnd
+source "${EXPDIR}/config.resources" postsnd
 
 export ENDHOUR=180
-if [[ "$FHMAX_GFS" -lt "$ENDHOUR" ]] ; then export ENDHOUR=$FHMAX_GFS ; fi
+if [[ ${FHMAX_GFS} -lt ${ENDHOUR} ]] ; then export ENDHOUR=${FHMAX_GFS} ; fi
 
 echo "END: config.postsnd"
diff --git a/parm/config/gfs/config.prep b/dev/parm/config/gfs/config.prep
similarity index 92%
rename from parm/config/gfs/config.prep
rename to dev/parm/config/gfs/config.prep
index e719d03d1df..34c7a9fca66 100644
--- a/parm/config/gfs/config.prep
+++ b/dev/parm/config/gfs/config.prep
@@ -6,7 +6,7 @@
 echo "BEGIN: config.prep"
 
 # Get task specific resources
-. $EXPDIR/config.resources prep
+source "${EXPDIR}/config.resources" prep
 
 export MAKE_PREPBUFR="YES"   # if NO, will copy prepbufr from globaldump
 export cdate10=${PDY}${cyc}
@@ -16,7 +16,7 @@ export PROCESS_TROPCY=${PROCESS_TROPCY:-NO}
 export TROPCYQCRELOSH="${SCRgfs}/exglobal_atmos_tropcy_qc_reloc.sh"
 
 export COMINtcvital=${COMINtcvital:-${DMPDIR}/${RUN}.${PDY}/${cyc}/atmos}
-export COMINsyn=${COMINsyn:-$(compath.py ${envir}/com/gfs/${gfs_ver})/syndat}
+export COMINsyn=${COMINsyn:-$(compath.py "${envir}/com/gfs/${gfs_ver}")/syndat}
 
 # Adjust observation error for GFS v16 parallels
 #
@@ -27,7 +27,7 @@ export PRVT=${FIXgfs}/gsi/prepobs_errtable.global
 
 
 # Set prepobs.errtable.global for GFS v16 retrospective parallels
-if [[ $RUN_ENVIR == "emc" ]]; then
+if [[ ${RUN_ENVIR} == "emc" ]]; then
   if [[ "${PDY}${cyc}" -ge "2019021900" && "${PDY}${cyc}" -lt "2019110706" ]]; then
     export PRVT=${FIXgfs}/gsi/gfsv16_historical/prepobs_errtable.global.2019021900
   fi
diff --git a/parm/config/gfs/config.prepatmiodaobs b/dev/parm/config/gfs/config.prepatmiodaobs
similarity index 100%
rename from parm/config/gfs/config.prepatmiodaobs
rename to dev/parm/config/gfs/config.prepatmiodaobs
diff --git a/parm/config/gfs/config.prepobsaero b/dev/parm/config/gfs/config.prepobsaero
similarity index 100%
rename from parm/config/gfs/config.prepobsaero
rename to dev/parm/config/gfs/config.prepobsaero
diff --git a/parm/config/gfs/config.prepoceanobs.j2 b/dev/parm/config/gfs/config.prepoceanobs.j2
similarity index 100%
rename from parm/config/gfs/config.prepoceanobs.j2
rename to dev/parm/config/gfs/config.prepoceanobs.j2
diff --git a/parm/config/gfs/config.resources b/dev/parm/config/gfs/config.resources
similarity index 100%
rename from parm/config/gfs/config.resources
rename to dev/parm/config/gfs/config.resources
diff --git a/parm/config/gfs/config.resources.AWSPW b/dev/parm/config/gfs/config.resources.AWSPW
similarity index 100%
rename from parm/config/gfs/config.resources.AWSPW
rename to dev/parm/config/gfs/config.resources.AWSPW
diff --git a/parm/config/gfs/config.resources.AZUREPW b/dev/parm/config/gfs/config.resources.AZUREPW
similarity index 100%
rename from parm/config/gfs/config.resources.AZUREPW
rename to dev/parm/config/gfs/config.resources.AZUREPW
diff --git a/parm/config/gfs/config.resources.GAEAC5 b/dev/parm/config/gfs/config.resources.GAEAC5
similarity index 100%
rename from parm/config/gfs/config.resources.GAEAC5
rename to dev/parm/config/gfs/config.resources.GAEAC5
diff --git a/parm/config/gfs/config.resources.GAEAC6 b/dev/parm/config/gfs/config.resources.GAEAC6
similarity index 100%
rename from parm/config/gfs/config.resources.GAEAC6
rename to dev/parm/config/gfs/config.resources.GAEAC6
diff --git a/parm/config/gfs/config.resources.GOOGLEPW b/dev/parm/config/gfs/config.resources.GOOGLEPW
similarity index 100%
rename from parm/config/gfs/config.resources.GOOGLEPW
rename to dev/parm/config/gfs/config.resources.GOOGLEPW
diff --git a/parm/config/gfs/config.resources.HERA b/dev/parm/config/gfs/config.resources.HERA
similarity index 100%
rename from parm/config/gfs/config.resources.HERA
rename to dev/parm/config/gfs/config.resources.HERA
diff --git a/parm/config/gfs/config.resources.HERCULES b/dev/parm/config/gfs/config.resources.HERCULES
similarity index 100%
rename from parm/config/gfs/config.resources.HERCULES
rename to dev/parm/config/gfs/config.resources.HERCULES
diff --git a/parm/config/gfs/config.resources.ORION b/dev/parm/config/gfs/config.resources.ORION
similarity index 100%
rename from parm/config/gfs/config.resources.ORION
rename to dev/parm/config/gfs/config.resources.ORION
diff --git a/parm/config/gfs/config.resources.WCOSS2 b/dev/parm/config/gfs/config.resources.WCOSS2
similarity index 100%
rename from parm/config/gfs/config.resources.WCOSS2
rename to dev/parm/config/gfs/config.resources.WCOSS2
diff --git a/parm/config/gfs/config.sfcanl b/dev/parm/config/gfs/config.sfcanl
similarity index 93%
rename from parm/config/gfs/config.sfcanl
rename to dev/parm/config/gfs/config.sfcanl
index 59a0af5c35b..fb6075e06a3 100644
--- a/parm/config/gfs/config.sfcanl
+++ b/dev/parm/config/gfs/config.sfcanl
@@ -6,7 +6,7 @@
 echo "BEGIN: config.sfcanl"
 
 # Get task specific resources
-. $EXPDIR/config.resources sfcanl
+source "${EXPDIR}/config.resources" sfcanl
 
 # Turn off NST in JEDIATMVAR
 if [[ "${DO_JEDIATMVAR}" == "YES" ]]; then
diff --git a/parm/config/gfs/config.snowanl.j2 b/dev/parm/config/gfs/config.snowanl.j2
similarity index 100%
rename from parm/config/gfs/config.snowanl.j2
rename to dev/parm/config/gfs/config.snowanl.j2
diff --git a/parm/config/gfs/config.stage_ic.j2 b/dev/parm/config/gfs/config.stage_ic.j2
similarity index 100%
rename from parm/config/gfs/config.stage_ic.j2
rename to dev/parm/config/gfs/config.stage_ic.j2
diff --git a/parm/config/gfs/config.tracker b/dev/parm/config/gfs/config.tracker
similarity index 100%
rename from parm/config/gfs/config.tracker
rename to dev/parm/config/gfs/config.tracker
diff --git a/parm/config/gfs/config.tropcy b/dev/parm/config/gfs/config.tropcy
similarity index 100%
rename from parm/config/gfs/config.tropcy
rename to dev/parm/config/gfs/config.tropcy
diff --git a/parm/config/gfs/config.ufs b/dev/parm/config/gfs/config.ufs
similarity index 100%
rename from parm/config/gfs/config.ufs
rename to dev/parm/config/gfs/config.ufs
diff --git a/parm/config/gfs/config.upp b/dev/parm/config/gfs/config.upp
similarity index 100%
rename from parm/config/gfs/config.upp
rename to dev/parm/config/gfs/config.upp
diff --git a/parm/config/gfs/config.verfozn b/dev/parm/config/gfs/config.verfozn
similarity index 100%
rename from parm/config/gfs/config.verfozn
rename to dev/parm/config/gfs/config.verfozn
diff --git a/parm/config/gfs/config.verfrad b/dev/parm/config/gfs/config.verfrad
similarity index 100%
rename from parm/config/gfs/config.verfrad
rename to dev/parm/config/gfs/config.verfrad
diff --git a/parm/config/gfs/config.vminmon b/dev/parm/config/gfs/config.vminmon
similarity index 100%
rename from parm/config/gfs/config.vminmon
rename to dev/parm/config/gfs/config.vminmon
diff --git a/parm/config/gfs/config.wave b/dev/parm/config/gfs/config.wave
similarity index 100%
rename from parm/config/gfs/config.wave
rename to dev/parm/config/gfs/config.wave
diff --git a/parm/config/gfs/config.waveawipsbulls b/dev/parm/config/gfs/config.waveawipsbulls
similarity index 78%
rename from parm/config/gfs/config.waveawipsbulls
rename to dev/parm/config/gfs/config.waveawipsbulls
index e8f27dd8815..4f40ed620e7 100644
--- a/parm/config/gfs/config.waveawipsbulls
+++ b/dev/parm/config/gfs/config.waveawipsbulls
@@ -6,6 +6,6 @@
 echo "BEGIN: config.waveawipsbulls"
 
 # Get task specific resources
-. $EXPDIR/config.resources waveawipsbulls
+source "${EXPDIR}/config.resources" waveawipsbulls
 
 echo "END: config.waveawipsbulls"
diff --git a/parm/config/gfs/config.waveawipsgridded b/dev/parm/config/gfs/config.waveawipsgridded
similarity index 92%
rename from parm/config/gfs/config.waveawipsgridded
rename to dev/parm/config/gfs/config.waveawipsgridded
index a752c659af2..95d495f2d42 100644
--- a/parm/config/gfs/config.waveawipsgridded
+++ b/dev/parm/config/gfs/config.waveawipsgridded
@@ -6,7 +6,7 @@
 echo "BEGIN: config.waveawipsgridded"
 
 # Get task specific resources
-. $EXPDIR/config.resources waveawipsgridded
+source "${EXPDIR}/config.resources" waveawipsgridded
 
 export GEMPAK_GRIDS=${GEMPAK_GRIDS:-ak_10m at_10m ep_10m wc_10m glo_30m}
 # export GEMPAK_GRIDS=${GEMPAK_GRIDS:-ao_9km at_10m ep_10m wc_10m glo_30m}
diff --git a/parm/config/gfs/config.wavegempak b/dev/parm/config/gfs/config.wavegempak
similarity index 87%
rename from parm/config/gfs/config.wavegempak
rename to dev/parm/config/gfs/config.wavegempak
index c0f53eb1b0c..45f4f7e2a70 100644
--- a/parm/config/gfs/config.wavegempak
+++ b/dev/parm/config/gfs/config.wavegempak
@@ -6,7 +6,7 @@
 echo "BEGIN: config.wavegempak"
 
 # Get task specific resources
-. $EXPDIR/config.resources wavegempak
+source "${EXPDIR}/config.resources" wavegempak
 
 #export GEMPAK_GRIDS=${GEMPAK_GRIDS:-'glo_30m at_10m ep_10m wc_10m ao_9km'} #Interpolated grids
 export GEMPAK_GRIDS=${GEMPAK_GRIDS:-${waveinterpGRD:-'glo_30m'}}
diff --git a/parm/config/gfs/config.waveinit b/dev/parm/config/gfs/config.waveinit
similarity index 82%
rename from parm/config/gfs/config.waveinit
rename to dev/parm/config/gfs/config.waveinit
index 61715f7f019..3e988726674 100644
--- a/parm/config/gfs/config.waveinit
+++ b/dev/parm/config/gfs/config.waveinit
@@ -6,7 +6,7 @@
 echo "BEGIN: config.waveinit"
 
 # Get task specific resources
-. $EXPDIR/config.resources waveinit
+source "${EXPDIR}/config.resources" waveinit
 
 # Step label
 export sigMODE=${sigMODE:-init}
diff --git a/parm/config/gfs/config.wavepostbndpnt b/dev/parm/config/gfs/config.wavepostbndpnt
similarity index 100%
rename from parm/config/gfs/config.wavepostbndpnt
rename to dev/parm/config/gfs/config.wavepostbndpnt
diff --git a/parm/config/gfs/config.wavepostbndpntbll b/dev/parm/config/gfs/config.wavepostbndpntbll
similarity index 100%
rename from parm/config/gfs/config.wavepostbndpntbll
rename to dev/parm/config/gfs/config.wavepostbndpntbll
diff --git a/parm/config/gfs/config.wavepostpnt b/dev/parm/config/gfs/config.wavepostpnt
similarity index 100%
rename from parm/config/gfs/config.wavepostpnt
rename to dev/parm/config/gfs/config.wavepostpnt
diff --git a/parm/config/gfs/config.wavepostsbs b/dev/parm/config/gfs/config.wavepostsbs
similarity index 100%
rename from parm/config/gfs/config.wavepostsbs
rename to dev/parm/config/gfs/config.wavepostsbs
diff --git a/parm/config/gfs/config.waveprep b/dev/parm/config/gfs/config.waveprep
similarity index 86%
rename from parm/config/gfs/config.waveprep
rename to dev/parm/config/gfs/config.waveprep
index 1f746eab776..b25cad8642e 100644
--- a/parm/config/gfs/config.waveprep
+++ b/dev/parm/config/gfs/config.waveprep
@@ -6,7 +6,7 @@
 echo "BEGIN: config.waveprep"
 
 # Get task specific resources
-. $EXPDIR/config.resources waveprep
+source "${EXPDIR}/config.resources" waveprep
 
 # Step label
 export sigMODE=${sigMODE:-prep}
@@ -20,7 +20,7 @@ export WAV_CUR_CDO_SMOOTH="NO"
 # Location of CDO module
 export CDO_ROOT=${CDO_ROOT:-/usrx/local/dev/packages/cdo/1.9.8}
 
-if [ "${WW3ICEINP}" = "YES" ]; then
+if [[ "${WW3ICEINP}" == "YES" ]]; then
   export WAVICEFILE=${RUN}.t${cyc}z.seaice.5min.grib2
 fi
 
diff --git a/parm/config/gfs/yaml/defaults.yaml b/dev/parm/config/gfs/yaml/defaults.yaml
similarity index 100%
rename from parm/config/gfs/yaml/defaults.yaml
rename to dev/parm/config/gfs/yaml/defaults.yaml
diff --git a/parm/config/sfs/config.aero.j2 b/dev/parm/config/sfs/config.aero.j2
similarity index 100%
rename from parm/config/sfs/config.aero.j2
rename to dev/parm/config/sfs/config.aero.j2
diff --git a/parm/config/sfs/config.arch_tars b/dev/parm/config/sfs/config.arch_tars
similarity index 100%
rename from parm/config/sfs/config.arch_tars
rename to dev/parm/config/sfs/config.arch_tars
diff --git a/parm/config/sfs/config.arch_vrfy b/dev/parm/config/sfs/config.arch_vrfy
similarity index 100%
rename from parm/config/sfs/config.arch_vrfy
rename to dev/parm/config/sfs/config.arch_vrfy
diff --git a/parm/config/sfs/config.atmos_ensstat b/dev/parm/config/sfs/config.atmos_ensstat
similarity index 100%
rename from parm/config/sfs/config.atmos_ensstat
rename to dev/parm/config/sfs/config.atmos_ensstat
diff --git a/parm/config/sfs/config.atmos_products b/dev/parm/config/sfs/config.atmos_products
similarity index 100%
rename from parm/config/sfs/config.atmos_products
rename to dev/parm/config/sfs/config.atmos_products
diff --git a/parm/config/sfs/config.base.j2 b/dev/parm/config/sfs/config.base.j2
similarity index 100%
rename from parm/config/sfs/config.base.j2
rename to dev/parm/config/sfs/config.base.j2
diff --git a/parm/config/sfs/config.cleanup b/dev/parm/config/sfs/config.cleanup
similarity index 100%
rename from parm/config/sfs/config.cleanup
rename to dev/parm/config/sfs/config.cleanup
diff --git a/parm/config/sfs/config.com b/dev/parm/config/sfs/config.com
similarity index 100%
rename from parm/config/sfs/config.com
rename to dev/parm/config/sfs/config.com
diff --git a/parm/config/sfs/config.efcs b/dev/parm/config/sfs/config.efcs
similarity index 100%
rename from parm/config/sfs/config.efcs
rename to dev/parm/config/sfs/config.efcs
diff --git a/parm/config/sfs/config.extractvars b/dev/parm/config/sfs/config.extractvars
similarity index 100%
rename from parm/config/sfs/config.extractvars
rename to dev/parm/config/sfs/config.extractvars
diff --git a/parm/config/sfs/config.fcst.j2 b/dev/parm/config/sfs/config.fcst.j2
similarity index 100%
rename from parm/config/sfs/config.fcst.j2
rename to dev/parm/config/sfs/config.fcst.j2
diff --git a/parm/config/sfs/config.ice b/dev/parm/config/sfs/config.ice
similarity index 100%
rename from parm/config/sfs/config.ice
rename to dev/parm/config/sfs/config.ice
diff --git a/parm/config/sfs/config.nsst b/dev/parm/config/sfs/config.nsst
similarity index 100%
rename from parm/config/sfs/config.nsst
rename to dev/parm/config/sfs/config.nsst
diff --git a/parm/config/sfs/config.oceanice_products b/dev/parm/config/sfs/config.oceanice_products
similarity index 100%
rename from parm/config/sfs/config.oceanice_products
rename to dev/parm/config/sfs/config.oceanice_products
diff --git a/parm/config/sfs/config.ocn.j2 b/dev/parm/config/sfs/config.ocn.j2
similarity index 100%
rename from parm/config/sfs/config.ocn.j2
rename to dev/parm/config/sfs/config.ocn.j2
diff --git a/parm/config/sfs/config.prep_emissions b/dev/parm/config/sfs/config.prep_emissions
similarity index 100%
rename from parm/config/sfs/config.prep_emissions
rename to dev/parm/config/sfs/config.prep_emissions
diff --git a/parm/config/sfs/config.resources b/dev/parm/config/sfs/config.resources
similarity index 100%
rename from parm/config/sfs/config.resources
rename to dev/parm/config/sfs/config.resources
diff --git a/parm/config/sfs/config.resources.AWSPW b/dev/parm/config/sfs/config.resources.AWSPW
similarity index 100%
rename from parm/config/sfs/config.resources.AWSPW
rename to dev/parm/config/sfs/config.resources.AWSPW
diff --git a/parm/config/sfs/config.resources.AZUREPW b/dev/parm/config/sfs/config.resources.AZUREPW
similarity index 100%
rename from parm/config/sfs/config.resources.AZUREPW
rename to dev/parm/config/sfs/config.resources.AZUREPW
diff --git a/parm/config/sfs/config.resources.GOOGLEPW b/dev/parm/config/sfs/config.resources.GOOGLEPW
similarity index 100%
rename from parm/config/sfs/config.resources.GOOGLEPW
rename to dev/parm/config/sfs/config.resources.GOOGLEPW
diff --git a/parm/config/sfs/config.stage_ic.j2 b/dev/parm/config/sfs/config.stage_ic.j2
similarity index 100%
rename from parm/config/sfs/config.stage_ic.j2
rename to dev/parm/config/sfs/config.stage_ic.j2
diff --git a/parm/config/sfs/config.ufs b/dev/parm/config/sfs/config.ufs
similarity index 100%
rename from parm/config/sfs/config.ufs
rename to dev/parm/config/sfs/config.ufs
diff --git a/parm/config/sfs/config.wave b/dev/parm/config/sfs/config.wave
similarity index 100%
rename from parm/config/sfs/config.wave
rename to dev/parm/config/sfs/config.wave
diff --git a/parm/config/sfs/config.waveinit b/dev/parm/config/sfs/config.waveinit
similarity index 100%
rename from parm/config/sfs/config.waveinit
rename to dev/parm/config/sfs/config.waveinit
diff --git a/parm/config/sfs/config.wavepostbndpnt b/dev/parm/config/sfs/config.wavepostbndpnt
similarity index 100%
rename from parm/config/sfs/config.wavepostbndpnt
rename to dev/parm/config/sfs/config.wavepostbndpnt
diff --git a/parm/config/sfs/config.wavepostbndpntbll b/dev/parm/config/sfs/config.wavepostbndpntbll
similarity index 100%
rename from parm/config/sfs/config.wavepostbndpntbll
rename to dev/parm/config/sfs/config.wavepostbndpntbll
diff --git a/parm/config/sfs/config.wavepostpnt b/dev/parm/config/sfs/config.wavepostpnt
similarity index 100%
rename from parm/config/sfs/config.wavepostpnt
rename to dev/parm/config/sfs/config.wavepostpnt
diff --git a/parm/config/sfs/config.wavepostsbs b/dev/parm/config/sfs/config.wavepostsbs
similarity index 100%
rename from parm/config/sfs/config.wavepostsbs
rename to dev/parm/config/sfs/config.wavepostsbs
diff --git a/parm/config/sfs/yaml/defaults.yaml b/dev/parm/config/sfs/yaml/defaults.yaml
similarity index 100%
rename from parm/config/sfs/yaml/defaults.yaml
rename to dev/parm/config/sfs/yaml/defaults.yaml
diff --git a/dev/workflow/setup_expt.py b/dev/workflow/setup_expt.py
index d46f3f9af22..2913fa7328d 100755
--- a/dev/workflow/setup_expt.py
+++ b/dev/workflow/setup_expt.py
@@ -174,9 +174,10 @@ def _gfs_args(parser):
         parser.add_argument('--run', help='RUN to start the experiment',
                             type=str, required=False, default='gdas')
         # --configdir is hidden from help
-        parser.add_argument('--configdir', help=SUPPRESS, type=str, required=False, default=os.path.join(_top, 'parm/config/gfs'))
-        parser.add_argument('--yaml', help='Defaults to substitute from', type=str,
-                            required=False, default=os.path.join(_top, 'parm/config/gfs/yaml/defaults.yaml'))
+        parser.add_argument('--configdir', help=SUPPRESS, type=str, required=False,
+                            default=os.path.join(_top, 'dev/parm/config/gfs'))
+        parser.add_argument('--yaml', help='Defaults to substitute from', type=str, required=False,
+                            default=os.path.join(_top, 'dev/parm/config/gfs/yaml/defaults.yaml'))
         return parser
 
     def _gfs_cycled_args(parser):
@@ -200,19 +201,21 @@ def _any_forecast_args(parser):
     def _gefs_args(parser):
         parser.add_argument('--start', help='restart mode: warm or cold', type=str,
                             choices=['warm', 'cold'], required=False, default='cold')
+        # --configdir is hidden from help
         parser.add_argument('--configdir', help=SUPPRESS, type=str, required=False,
-                            default=os.path.join(_top, 'parm/config/gefs'))
+                            default=os.path.join(_top, 'dev/parm/config/gefs'))
         parser.add_argument('--yaml', help='Defaults to substitute from', type=str, required=False,
-                            default=os.path.join(_top, 'parm/config/gefs/yaml/defaults.yaml'))
+                            default=os.path.join(_top, 'dev/parm/config/gefs/yaml/defaults.yaml'))
         return parser
 
     def _sfs_args(parser):
         parser.add_argument('--start', help='restart mode: warm or cold', type=str,
                             choices=['warm', 'cold'], required=False, default='cold')
+        # --configdir is hidden from help
         parser.add_argument('--configdir', help=SUPPRESS, type=str, required=False,
-                            default=os.path.join(_top, 'parm/config/sfs'))
+                            default=os.path.join(_top, 'dev/parm/config/sfs'))
         parser.add_argument('--yaml', help='Defaults to substitute from', type=str, required=False,
-                            default=os.path.join(_top, 'parm/config/sfs/yaml/defaults.yaml'))
+                            default=os.path.join(_top, 'dev/parm/config/sfs/yaml/defaults.yaml'))
         return parser
 
     description = """
diff --git a/docs/source/setup.rst b/docs/source/setup.rst
index 56caf359644..29e0297feed 100644
--- a/docs/source/setup.rst
+++ b/docs/source/setup.rst
@@ -55,7 +55,7 @@ where:
    * ``$IDATE`` is the initial start date of your run (first cycle CDATE, YYYYMMDDCC)
    * ``$EDATE`` is the ending date of your run (YYYYMMDDCC) and is the last cycle that will complete [default: $IDATE]
    * ``$PSLOT`` is the name of your experiment [default: test]
-   * ``$CONFIGDIR`` is the path to the ``/config`` folder under the copy of the system you're using [default: $TOP_OF_CLONE/parm/config/]
+   * ``$CONFIGDIR`` is the path to the ``/config`` folder under the copy of the system you're using [default: $TOP_OF_CLONE/dev/parm/config/]
    * ``$RESDETATMOS`` is the resolution of the atmosphere component of the system (i.e. 768 for C768) [default: 384]
    * ``$RESDETOCEAN`` is the resolution of the ocean component of the system (i.e. 0.25 for 1/4 degree) [default: 0.; determined based on atmosphere resolution]
    * ``$INTERVAL_GFS`` is the forecast interval in hours [default: 6]
@@ -177,7 +177,7 @@ where:
    * ``$NENS`` is the number of ensemble members [default: 20]
    * ``$RUN`` is the starting phase [default: gdas]
    * ``$PSLOT`` is the name of your experiment [default: test]
-   * ``$CONFIGDIR`` is the path to the config folder under the copy of the system you're using [default: $TOP_OF_CLONE/parm/config/]
+   * ``$CONFIGDIR`` is the path to the config folder under the copy of the system you're using [default: $TOP_OF_CLONE/dev/parm/config/]
    * ``$COMROOT`` is the path to your experiment output directory. Your ``ROTDIR`` (rotating com directory) will be created using ``COMROOT`` and ``PSLOT``. [default: $HOME]
    * ``$EXPDIR`` is the path to your experiment directory where your configs will be placed and where you will find your workflow monitoring files (i.e. rocoto database and xml file). DO NOT include PSLOT folder at end of path, it will be built for you. [default: $HOME]
    * ``$ICSDIR`` is the path to the ICs for your run if generated separately. [default: None]
@@ -187,7 +187,7 @@ Example:
 ::
 
    cd dev/workflow
-   ./setup_expt.py gfs cycled --pslot test --configdir /home/Joe.Schmo/git/global-workflow/parm/config --idate 2020010100 --edate 2020010118 --comroot /some_large_disk_area/Joe.Schmo/comroot --expdir /some_safe_disk_area/Joe.Schmo/expdir --resdetatmos 384 --resensatmos 192 --nens 80 --interval 6
+   ./setup_expt.py gfs cycled --pslot test --configdir /home/Joe.Schmo/git/global-workflow/dev/parm/config --idate 2020010100 --edate 2020010118 --comroot /some_large_disk_area/Joe.Schmo/comroot --expdir /some_safe_disk_area/Joe.Schmo/expdir --resdetatmos 384 --resensatmos 192 --nens 80 --interval 6
 
 Example ``setup_expt.py`` on Orion:
 
diff --git a/parm/config/gfs/yaml/test_ci.yaml b/parm/config/gfs/yaml/test_ci.yaml
deleted file mode 100644
index 7425d4d0296..00000000000
--- a/parm/config/gfs/yaml/test_ci.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-defaults:
-  !INC {{ PARMgfs }}/config/gfs/yaml/defaults.yaml
-base:
-  ACCOUNT: "nems"
diff --git a/parm/config/gfs/yaml/stat_base_config.yaml.j2 b/parm/gdas/stat_base_config.yaml.j2
similarity index 100%
rename from parm/config/gfs/yaml/stat_base_config.yaml.j2
rename to parm/gdas/stat_base_config.yaml.j2