diff --git a/README.md b/README.md
index f6209d14..9e8f843b 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ This section provides instructions for running all tests in the main obsForge re
 
 2. **Load modules** (on supported HPC systems):
    ```bash
-   source ush/of_setup.sh
+  source dev/ush/of_setup.sh
    ```
 
 3. **Set up Python environment** for pytest:
@@ -141,7 +141,7 @@ pytest ush/python/pyobsforge/tests/ --disable-warnings -v
 
 ## Workflow Usage
 ```console
-cd ush
+cd dev/ush
 source of_setup.sh
 setup_xml.py --config ../parm/config.yaml  --template ../parm/obsforge_rocoto_template.xml.j2 --output obsforge.xml
 rocotorun -d obsforge.db -w obsforge.xml
diff --git a/jobs/rocoto/aoddump.sh b/dev/job_cards/rocoto/aoddump.sh
similarity index 89%
rename from jobs/rocoto/aoddump.sh
rename to dev/job_cards/rocoto/aoddump.sh
index dd8bec25..c07e0795 100755
--- a/jobs/rocoto/aoddump.sh
+++ b/dev/job_cards/rocoto/aoddump.sh
@@ -15,6 +15,6 @@ export jobid="${job}.$$"
 
 ###############################################################
 # Execute the JJOB
-"${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_AOD_DUMP"
+"${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_AOD_DUMP"
 status=$?
 exit "${status}"
diff --git a/jobs/rocoto/atmosbufrdump.sh b/dev/job_cards/rocoto/atmosbufrdump.sh
similarity index 87%
rename from jobs/rocoto/atmosbufrdump.sh
rename to dev/job_cards/rocoto/atmosbufrdump.sh
index 9979253e..8cffda91 100755
--- a/jobs/rocoto/atmosbufrdump.sh
+++ b/dev/job_cards/rocoto/atmosbufrdump.sh
@@ -15,6 +15,6 @@ export jobid="${job}.$$"
 
 ###############################################################
 # Execute the JJOB
-"${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP"
+"${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP"
 status=$?
 exit "${status}"
diff --git a/jobs/rocoto/gsitoioda.sh b/dev/job_cards/rocoto/gsitoioda.sh
similarity index 88%
rename from jobs/rocoto/gsitoioda.sh
rename to dev/job_cards/rocoto/gsitoioda.sh
index f7772e85..ec0efc65 100755
--- a/jobs/rocoto/gsitoioda.sh
+++ b/dev/job_cards/rocoto/gsitoioda.sh
@@ -15,6 +15,6 @@ export jobid="${job}.$$"
 
 ###############################################################
 # Execute the JJOB
-"${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_GSI_TO_IODA"
+"${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_GSI_TO_IODA"
 status=$?
 exit "${status}"
diff --git a/jobs/rocoto/marinebufrdump.sh b/dev/job_cards/rocoto/marinebufrdump.sh
similarity index 87%
rename from jobs/rocoto/marinebufrdump.sh
rename to dev/job_cards/rocoto/marinebufrdump.sh
index 977ab1e6..cf0fc3cb 100755
--- a/jobs/rocoto/marinebufrdump.sh
+++ b/dev/job_cards/rocoto/marinebufrdump.sh
@@ -15,6 +15,6 @@ export jobid="${job}.$$"
 
 ###############################################################
 # Execute the JJOB
-"${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_MARINE_BUFR_DUMP"
+"${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_MARINE_BUFR_DUMP"
 status=$?
 exit "${status}"
diff --git a/jobs/rocoto/marinedump.sh b/dev/job_cards/rocoto/marinedump.sh
similarity index 88%
rename from jobs/rocoto/marinedump.sh
rename to dev/job_cards/rocoto/marinedump.sh
index c5185031..ab325282 100755
--- a/jobs/rocoto/marinedump.sh
+++ b/dev/job_cards/rocoto/marinedump.sh
@@ -15,6 +15,6 @@ export jobid="${job}.$$"
 
 ###############################################################
 # Execute the JJOB
-"${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_MARINE_DUMP"
+"${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_MARINE_DUMP"
 status=$?
 exit "${status}"
diff --git a/jobs/rocoto/stageout.sh b/dev/job_cards/rocoto/stageout.sh
similarity index 88%
rename from jobs/rocoto/stageout.sh
rename to dev/job_cards/rocoto/stageout.sh
index 83b7d095..185774d2 100755
--- a/jobs/rocoto/stageout.sh
+++ b/dev/job_cards/rocoto/stageout.sh
@@ -15,6 +15,6 @@ export jobid="${job}.$$"
 
 ###############################################################
 # Execute the JJOB
-"${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_STAGE_OUTPUT"
+"${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_STAGE_OUTPUT"
 status=$?
 exit "${status}"
diff --git a/jobs/JOBSFORGE_GLOBAL_AOD_DUMP b/dev/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
similarity index 100%
rename from jobs/JOBSFORGE_GLOBAL_AOD_DUMP
rename to dev/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
diff --git a/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP b/dev/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP
similarity index 100%
rename from jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP
rename to dev/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP
diff --git a/jobs/JOBSFORGE_GLOBAL_GSI_TO_IODA b/dev/jobs/JOBSFORGE_GLOBAL_GSI_TO_IODA
similarity index 100%
rename from jobs/JOBSFORGE_GLOBAL_GSI_TO_IODA
rename to dev/jobs/JOBSFORGE_GLOBAL_GSI_TO_IODA
diff --git a/jobs/JOBSFORGE_GLOBAL_MARINE_BUFR_DUMP b/dev/jobs/JOBSFORGE_GLOBAL_MARINE_BUFR_DUMP
similarity index 100%
rename from jobs/JOBSFORGE_GLOBAL_MARINE_BUFR_DUMP
rename to dev/jobs/JOBSFORGE_GLOBAL_MARINE_BUFR_DUMP
diff --git a/jobs/JOBSFORGE_GLOBAL_MARINE_DUMP b/dev/jobs/JOBSFORGE_GLOBAL_MARINE_DUMP
similarity index 100%
rename from jobs/JOBSFORGE_GLOBAL_MARINE_DUMP
rename to dev/jobs/JOBSFORGE_GLOBAL_MARINE_DUMP
diff --git a/jobs/JOBSFORGE_GLOBAL_STAGE_OUTPUT b/dev/jobs/JOBSFORGE_GLOBAL_STAGE_OUTPUT
similarity index 100%
rename from jobs/JOBSFORGE_GLOBAL_STAGE_OUTPUT
rename to dev/jobs/JOBSFORGE_GLOBAL_STAGE_OUTPUT
diff --git a/ush/of_setup.sh b/dev/ush/of_setup.sh
similarity index 100%
rename from ush/of_setup.sh
rename to dev/ush/of_setup.sh
diff --git a/jobs b/jobs
new file mode 120000
index 00000000..cd82460e
--- /dev/null
+++ b/jobs
@@ -0,0 +1 @@
+dev/jobs/
\ No newline at end of file
diff --git a/parm/gdas_realtime.xml.j2 b/parm/gdas_realtime.xml.j2
index bc174516..b897b02e 100644
--- a/parm/gdas_realtime.xml.j2
+++ b/parm/gdas_realtime.xml.j2
@@ -8,7 +8,7 @@
 	-->
 	<!ENTITY PSLOT "{{ PSLOT }}">
 	<!ENTITY ROTDIR "{{ COMROOT }}/{{ PSLOT }}">
-	<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/jobs/rocoto">
+	<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/dev/job_cards/rocoto">
 	<!ENTITY MAXTRIES "2">
 ]>
 
@@ -27,7 +27,7 @@
 -->
 <task name="gcdas_aod_dump" cycledefs="gcdas" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/aoddump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/aoddump.sh</command>
 
 	<jobname><cyclestr>obsforge_gcdas_aod_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -65,7 +65,7 @@
 -->
 <task name="gdas_atmos_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/atmosbufrdump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/atmosbufrdump.sh</command>
 
 	<jobname><cyclestr>obsforge_gdas_atmos_bufr_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -103,7 +103,7 @@
 -->
 <task name="gdas_marine_dump" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-        <command>{{ HOMEobsforge }}/jobs/rocoto/marinedump.sh</command>
+		<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinedump.sh</command>
 
         <jobname><cyclestr>obsforge_gdas_marine_dump_@H</cyclestr></jobname>
         <account>{{ ACCOUNT }}</account>
@@ -141,7 +141,7 @@
 -->
 <task name="gdas_marine_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-        <command>{{ HOMEobsforge }}/jobs/rocoto/marinebufrdump.sh</command>
+		<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinebufrdump.sh</command>
 
         <jobname><cyclestr>obsforge_gdas_marine_bufr_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
diff --git a/parm/gfs_realtime.xml.j2 b/parm/gfs_realtime.xml.j2
index c1d100e3..5bb2b2dd 100644
--- a/parm/gfs_realtime.xml.j2
+++ b/parm/gfs_realtime.xml.j2
@@ -8,7 +8,7 @@
 	-->
 	<!ENTITY PSLOT "{{ PSLOT }}">
 	<!ENTITY ROTDIR "{{ COMROOT }}/{{ PSLOT }}">
-	<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/jobs/rocoto">
+	<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/dev/job_cards/rocoto">
 	<!ENTITY MAXTRIES "2">
 ]>
 
@@ -25,7 +25,7 @@
 -->
 <task name="gfs_atmos_bufr_dump" cycledefs="gfs" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/atmosbufrdump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/atmosbufrdump.sh</command>
 
 	<jobname><cyclestr>obsforge_gfs_atmos_bufr_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -63,7 +63,7 @@
 -->
 <task name="gfs_marine_dump" cycledefs="gfs" maxtries="&MAXTRIES;">
 
-        <command>{{ HOMEobsforge }}/jobs/rocoto/marinedump.sh</command>
+		<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinedump.sh</command>
 
         <jobname><cyclestr>obsforge_gfs_marine_dump_@H</cyclestr></jobname>
         <account>{{ ACCOUNT }}</account>
@@ -101,7 +101,7 @@
 -->
 <task name="gfs_marine_bufr_dump" cycledefs="gfs" maxtries="&MAXTRIES;">
 
-        <command>{{ HOMEobsforge }}/jobs/rocoto/marinebufrdump.sh</command>
+		<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinebufrdump.sh</command>
 
         <jobname><cyclestr>obsforge_gfs_marine_bufr_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
diff --git a/parm/gsi_to_ioda.xml.j2 b/parm/gsi_to_ioda.xml.j2
index 0ea0efdd..65c78d7f 100644
--- a/parm/gsi_to_ioda.xml.j2
+++ b/parm/gsi_to_ioda.xml.j2
@@ -8,7 +8,7 @@
 	-->
 	<!ENTITY PSLOT "{{ PSLOT }}">
 	<!ENTITY ROTDIR "{{ COMROOT }}/{{ PSLOT }}">
-	<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/jobs/rocoto">
+	<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/dev/job_cards/rocoto">
 	<!ENTITY MAXTRIES "2">
 ]>
 
@@ -28,7 +28,7 @@
 -->
 <task name="gdas_gsi_to_ioda" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/gsitoioda.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/gsitoioda.sh</command>
 
 	<jobname><cyclestr>obsforge_gdas_gsi_to_ioda_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -68,7 +68,7 @@
 -->
 <task name="gdas_atmos_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/atmosbufrdump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/atmosbufrdump.sh</command>
 
 	<jobname><cyclestr>obsforge_gdas_atmos_bufr_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -107,7 +107,7 @@
 -->
 <task name="gdas_stage_output" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/stageout.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/stageout.sh</command>
 
 	<jobname><cyclestr>obsforge_gdas_stage_output_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
diff --git a/parm/obsforge_rocoto_template.xml.j2 b/parm/obsforge_rocoto_template.xml.j2
index 213b3a30..e38681e7 100644
--- a/parm/obsforge_rocoto_template.xml.j2
+++ b/parm/obsforge_rocoto_template.xml.j2
@@ -8,7 +8,7 @@
 	-->
 	<!ENTITY PSLOT "{{ PSLOT }}">
 	<!ENTITY ROTDIR "{{ COMROOT }}/{{ PSLOT }}">
-	<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/jobs/rocoto">
+	<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/dev/job_cards/rocoto">
 	<!ENTITY MAXTRIES "2">
 ]>
 
@@ -27,7 +27,7 @@
 -->
 <task name="gfs_aod_dump" cycledefs="gfs" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/aoddump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/aoddump.sh</command>
 
 	<jobname><cyclestr>obsforge_gfs_aod_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -66,7 +66,7 @@
 -->
 <task name="gdas_aod_dump" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/aoddump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/aoddump.sh</command>
 
 	<jobname><cyclestr>obsforge_gdas_aod_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -105,7 +105,7 @@
 -->
 <task name="gdas_atmos_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/atmosbufrdump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/atmosbufrdump.sh</command>
 
 	<jobname><cyclestr>obsforge_gdas_atmos_bufr_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -140,7 +140,7 @@
 -->
 <task name="gfs_marine_dump" cycledefs="gfs" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/marinedump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinedump.sh</command>
 
 	<jobname><cyclestr>obsforge_gfs_marine_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -178,7 +178,7 @@
 -->
 <task name="gfs_marine_bufr_dump" cycledefs="gfs" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/marinebufrdump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinebufrdump.sh</command>
 
 	<jobname><cyclestr>obsforge_gfs_marine_bufr_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -217,7 +217,7 @@
 -->
 <task name="gdas_marine_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/marinebufrdump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinebufrdump.sh</command>
 
 	<jobname><cyclestr>obsforge_gdas_marine_bufr_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
diff --git a/parm/obsforge_rocoto_template_pbspro.xml.j2 b/parm/obsforge_rocoto_template_pbspro.xml.j2
index 437103a3..00bae74b 100644
--- a/parm/obsforge_rocoto_template_pbspro.xml.j2
+++ b/parm/obsforge_rocoto_template_pbspro.xml.j2
@@ -8,7 +8,7 @@
 	-->
 	<!ENTITY PSLOT "{{ PSLOT }}">
 	<!ENTITY ROTDIR "{{ COMROOT }}/{{ PSLOT }}">
-	<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/jobs/rocoto">
+	<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/dev/job_cards/rocoto">
 	<!ENTITY MAXTRIES "2">
 ]>
 
@@ -27,7 +27,7 @@
 -->
 <task name="gfs_aod_dump" cycledefs="gfs" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/aoddump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/aoddump.sh</command>
 
 	<jobname><cyclestr>obsforge_gfs_aod_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -66,7 +66,7 @@
 
 <task name="gdas_atmos_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-        <command>{{ HOMEobsforge }}/jobs/rocoto/atmosbufrdump.sh</command>
+		<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/atmosbufrdump.sh</command>
 
         <jobname><cyclestr>obsforge_gdas_atmos_bufr_dump_@H</cyclestr></jobname>
         <account>{{ ACCOUNT }}</account>
@@ -100,7 +100,7 @@
 -->
 <task name="gdas_aod_dump" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/aoddump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/aoddump.sh</command>
 
 	<jobname><cyclestr>obsforge_gdas_aod_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -138,7 +138,7 @@
 -->
 <task name="gfs_marine_dump" cycledefs="gfs" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/marinedump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinedump.sh</command>
 
 	<jobname><cyclestr>obsforge_gfs_marine_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -176,7 +176,7 @@
 -->
 <task name="gfs_marine_bufr_dump" cycledefs="gfs" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/marinebufrdump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinebufrdump.sh</command>
 
 	<jobname><cyclestr>obsforge_gfs_marine_bufr_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -214,7 +214,7 @@
 -->
 <task name="gdas_marine_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/marinebufrdump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinebufrdump.sh</command>
 
 	<jobname><cyclestr>obsforge_gdas_marine_bufr_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
diff --git a/parm/obsforge_rocoto_template_pbspro_realtime.xml.j2 b/parm/obsforge_rocoto_template_pbspro_realtime.xml.j2
index 09336d74..74800cf9 100644
--- a/parm/obsforge_rocoto_template_pbspro_realtime.xml.j2
+++ b/parm/obsforge_rocoto_template_pbspro_realtime.xml.j2
@@ -8,7 +8,7 @@
 	-->
 	<!ENTITY PSLOT "{{ PSLOT }}">
 	<!ENTITY ROTDIR "{{ COMROOT }}/{{ PSLOT }}">
-	<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/jobs/rocoto">
+	<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/dev/job_cards/rocoto">
 	<!ENTITY MAXTRIES "2">
 ]>
 
@@ -28,7 +28,7 @@
 -->
 <task name="gcdas_aod_dump" cycledefs="gcdas" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/aoddump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/aoddump.sh</command>
 
 	<jobname><cyclestr>obsforge_gcdas_aod_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -66,7 +66,7 @@
 -->
 <task name="gdas_atmos_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/atmosbufrdump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/atmosbufrdump.sh</command>
 
 	<jobname><cyclestr>obsforge_gdas_atmos_bufr_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
@@ -101,7 +101,7 @@
 -->
 <task name="gfs_marine_dump" cycledefs="gfs" maxtries="&MAXTRIES;">
 
-	<command>{{ HOMEobsforge }}/jobs/rocoto/marinedump.sh</command>
+	<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinedump.sh</command>
 
 	<jobname><cyclestr>obsforge_gfs_marine_dump_@H</cyclestr></jobname>
 	<account>{{ ACCOUNT }}</account>
diff --git a/parm/obsforge_test_hera.xml b/parm/obsforge_test_hera.xml
index dc59281f..48dc37a6 100644
--- a/parm/obsforge_test_hera.xml
+++ b/parm/obsforge_test_hera.xml
@@ -8,7 +8,7 @@
 	-->
 	<!ENTITY PSLOT "obsforge">
 	<!ENTITY ROTDIR "/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/COMROOT/obsforge">
-	<!ENTITY JOBS_DIR "/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/jobs/rocoto">
+	<!ENTITY JOBS_DIR "/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/dev/job_cards/rocoto">
 	<!ENTITY MAXTRIES "2">
 ]>
 
@@ -22,7 +22,7 @@
 
 <task name="gfs_aod_dump" cycledefs="gfs" maxtries="&MAXTRIES;">
 
-	<command>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/jobs/rocoto/aoddump.sh</command>
+	<command>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/dev/job_cards/rocoto/aoddump.sh</command>
 
 	<jobname><cyclestr>obsforge_gfs_aod_dump_@H</cyclestr></jobname>
 	<account>da-cpu</account>
@@ -56,7 +56,7 @@
 
 <task name="gdas_aod_dump" cycledefs="gdas" maxtries="&MAXTRIES;">
 
-	<command>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/jobs/rocoto/aoddump.sh</command>
+	<command>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/dev/job_cards/rocoto/aoddump.sh</command>
 
 	<jobname><cyclestr>obsforge_gdas_aod_dump_@H</cyclestr></jobname>
 	<account>da-cpu</account>
diff --git a/test/atmos/run_test_obsforge_global_atmos_bufr_dump.sh b/test/atmos/run_test_obsforge_global_atmos_bufr_dump.sh
index 7c726c30..095eea6b 100755
--- a/test/atmos/run_test_obsforge_global_atmos_bufr_dump.sh
+++ b/test/atmos/run_test_obsforge_global_atmos_bufr_dump.sh
@@ -92,7 +92,7 @@ nodes: 1
 ntasks_per_node: 24
 threads_per_task: 1
 memory: ${memory}
-command: ${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP
+command: ${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP
 filename: submit_${type}.sh
 EOF
 
@@ -108,5 +108,5 @@ elif [[ $SCHEDULER = 'pbspro' ]]; then
     $HOMEobsforge/test/generate_job_script.py ${config_yaml}
     qsub -V -W block=true submit_${type}.sh
 else
-    ${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP
+    ${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP
 fi
diff --git a/test/chem/run_test_obsforge_global_aod_dump.sh b/test/chem/run_test_obsforge_global_aod_dump.sh
index d76e9c97..70063641 100755
--- a/test/chem/run_test_obsforge_global_aod_dump.sh
+++ b/test/chem/run_test_obsforge_global_aod_dump.sh
@@ -68,7 +68,7 @@ nodes: 1
 ntasks_per_node: 24
 threads_per_task: 1
 memory: ${memory}
-command: ${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
+command: ${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
 filename: submit_${type}.sh
 EOF
 
@@ -84,5 +84,5 @@ elif [[ $SCHEDULER = 'pbspro' ]]; then
     $HOMEobsforge/test/generate_job_script.py ${config_yaml}
     qsub -V -W block=true submit_${type}.sh
 else
-    ${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
+    ${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
 fi
diff --git a/versions/build.wcoss2.ver b/versions/build.wcoss2.ver
new file mode 100644
index 00000000..e69de29b
diff --git a/versions/run.wcoss2.ver b/versions/run.wcoss2.ver
new file mode 100644
index 00000000..e69de29b