diff --git a/sorc/iodaconv b/sorc/iodaconv
index 4ee7adc13..7f3202e70 160000
--- a/sorc/iodaconv
+++ b/sorc/iodaconv
@@ -1 +1 @@
-Subproject commit 4ee7adc13a7688e7ea0ebd51eaec5c62df649a7f
+Subproject commit 7f3202e70d3412d09228d2bf623926abd07f81b2
diff --git a/sorc/oops b/sorc/oops
index 88c090ca3..72bdde143 160000
--- a/sorc/oops
+++ b/sorc/oops
@@ -1 +1 @@
-Subproject commit 88c090ca3a09cbb95ad394b5970244f8cb0fbc36
+Subproject commit 72bdde143191a93d2d339d012a21bcfa18533a23
diff --git a/sorc/saber b/sorc/saber
index 812d0ee1b..6816ad7d6 160000
--- a/sorc/saber
+++ b/sorc/saber
@@ -1 +1 @@
-Subproject commit 812d0ee1bc91f82716d121750674da0527cafec0
+Subproject commit 6816ad7d6d93005e0a438385c2564cb0002e285c
diff --git a/sorc/soca b/sorc/soca
index 738a2c7b9..5d7966f32 160000
--- a/sorc/soca
+++ b/sorc/soca
@@ -1 +1 @@
-Subproject commit 738a2c7b9979182dcb3a78284b7a5434bb609204
+Subproject commit 5d7966f32e8386a9c6e041bd1ec1609aff113101
diff --git a/sorc/ufo b/sorc/ufo
index 2b039e652..894f8104b 160000
--- a/sorc/ufo
+++ b/sorc/ufo
@@ -1 +1 @@
-Subproject commit 2b039e6520dfcd03c8e282b515519b91ec667e65
+Subproject commit 894f8104b46b50604bb809b473bcfce29f789bc1
diff --git a/sorc/vader b/sorc/vader
index 0a1ca4230..f4ae2d9a7 160000
--- a/sorc/vader
+++ b/sorc/vader
@@ -1 +1 @@
-Subproject commit 0a1ca423078744a9af86bd3910194e5e5b05bacb
+Subproject commit f4ae2d9a7d5362fc46a6b521afda662705d23d6d
diff --git a/test/atm/global-workflow/setup_workflow_exp.sh b/test/atm/global-workflow/setup_workflow_exp.sh
index 47bb0d82e..b2f533b7c 100755
--- a/test/atm/global-workflow/setup_workflow_exp.sh
+++ b/test/atm/global-workflow/setup_workflow_exp.sh
@@ -33,7 +33,7 @@ sed -i -e "s~@dumpdir@~${GDASAPP_TESTDATA}/lowres~g" config.yaml
 
 # run the script
 echo "Running global-workflow experiment generation script"
-$srcdir/../../workflow/setup_expt.py gfs cycled --idate $idate  \
+$srcdir/../../dev/workflow/setup_expt.py gfs cycled --idate $idate  \
                        --edate $edate \
                        --app $app \
                        --start $starttype \
diff --git a/test/gw-ci/CMakeLists.txt b/test/gw-ci/CMakeLists.txt
index 183a80fa0..16cf04bde 100644
--- a/test/gw-ci/CMakeLists.txt
+++ b/test/gw-ci/CMakeLists.txt
@@ -257,7 +257,7 @@ if (WORKFLOW_TESTS)
     # GSI Atm DA C96/C48
     # ------------------
     set(pslot "C96C48_hybatmDA")
-    set(YAML_PATH ${HOMEgfs}/ci/cases/pr/${pslot}.yaml)
+    set(YAML_PATH ${HOMEgfs}/dev/ci/cases/pr/${pslot}.yaml)
     set(HALF_CYCLE_TASKS
       "gdas_stage_ic"
       "gdas_fcst"
@@ -287,7 +287,7 @@ if (WORKFLOW_TESTS)
   # -------------------
   if(${TEST_GFS18})
     set(pslot "C96C48_ufs_hybatmDA")
-    set(YAML_PATH ${HOMEgfs}/ci/cases/pr/${pslot}.yaml)
+    set(YAML_PATH ${HOMEgfs}/dev/ci/cases/pr/${pslot}.yaml)
     set(HALF_CYCLE_TASKS
       "gdas_stage_ic"
       "gdas_fcst"
@@ -321,7 +321,7 @@ if (WORKFLOW_TESTS)
   # ----------------
   if(${TEST_AERO_LAND})
     set(pslot "C96C48_hybatmaerosnowDA")
-    set(YAML_PATH ${HOMEgfs}/ci/cases/pr/${pslot}.yaml)
+    set(YAML_PATH ${HOMEgfs}/dev/ci/cases/pr/${pslot}.yaml)
     set(HALF_CYCLE_TASKS
       "gdas_stage_ic"
       "gdas_fcst"
@@ -356,7 +356,7 @@ if (WORKFLOW_TESTS)
     # GSI Atm DA C48, JEDI Marine DA 500
     # ----------------------------------
     set(pslot "C48mx500_3DVarAOWCDA")
-    set(YAML_PATH ${HOMEgfs}/ci/cases/pr/${pslot}.yaml)
+    set(YAML_PATH ${HOMEgfs}/dev/ci/cases/pr/${pslot}.yaml)
     set(HALF_CYCLE_TASKS
       "gdas_stage_ic"
       "gdas_waveinit"
@@ -382,7 +382,7 @@ if (WORKFLOW_TESTS)
     # -------------
     set(pslot "C48mx500_hybAOWCDA")
     set(letkf TRUE)
-    set(YAML_PATH ${HOMEgfs}/ci/cases/pr/${pslot}.yaml)
+    set(YAML_PATH ${HOMEgfs}/dev/ci/cases/pr/${pslot}.yaml)
     set(HALF_CYCLE_TASKS
       "gdas_stage_ic"
       "gdas_fcst"
@@ -406,7 +406,7 @@ if (WORKFLOW_TESTS)
   # -----------------------
   if(TEST_GFS17)
     set(pslot "C384mx025_3DVarAOWCDA")
-    set(YAML_PATH ${HOMEgfs}/ci/cases/gfsv17/${pslot}.yaml)
+    set(YAML_PATH ${HOMEgfs}/dev/ci/cases/gfsv17/${pslot}.yaml)
     set(HALF_CYCLE_TASKS
       "gdas_stage_ic"
       "gdas_fcst")
diff --git a/test/gw-ci/create_exp.sh b/test/gw-ci/create_exp.sh
index 2cdfa70b7..3a27be8cc 100755
--- a/test/gw-ci/create_exp.sh
+++ b/test/gw-ci/create_exp.sh
@@ -6,7 +6,7 @@ exp_path=$4
 
 # Get ICSDIR_ROOT
 source "${HOMEgfs}/ush/detect_machine.sh"
-source "${HOMEgfs}/ci/platforms/config.${MACHINE_ID}"
+source "${HOMEgfs}/dev/ci/platforms/config.${MACHINE_ID}"
 
 # Arguments for the exp setup
 expyaml=${expyaml_ctest}
@@ -18,7 +18,7 @@ if [[ $MACHINE_ID = wcoss2 ]]; then
 fi  
 
 # Source the gw environement
-source ${HOMEgfs}/workflow/gw_setup.sh
+source ${HOMEgfs}/dev/workflow/gw_setup.sh
 
 # Create the experiment
-${HOMEgfs}/workflow/create_experiment.py --yaml ${expyaml} --overwrite --force
+${HOMEgfs}/dev/workflow/create_experiment.py --yaml ${expyaml} --overwrite --force