diff --git a/parm/soca/obsprep/obsprep_config.yaml b/parm/soca/obsprep/obsprep_config.yaml
index 1be4c45d3..bed03bcf9 100644
--- a/parm/soca/obsprep/obsprep_config.yaml
+++ b/parm/soca/obsprep/obsprep_config.yaml
@@ -1,41 +1,44 @@
 observations:
 - obs space:
     name: sss_smap
-    dmpdir subdir: SSS
-    dmpdir regex: SMAP_L2B_SSS_NRT_?????_[AD]_????????T??????.h5
+    dmpdir subdir: ocean/sss
+    dmpdir regex: SMAP_L2B_SSS_NRT_*.h5
     provider: SMAP
     output file: sss_smap.ioda.nc
 - obs space:
     name: sss_smos
     provider: SMOS
-    dmpdir subdir: SSS
+    dmpdir subdir: ocean/sss
     output file: sss_smos.ioda.nc
-    dmpdir regex: SM_OPER_MIR_OSUDP2_????????T??????_????????T??????_700_001_1.nc
+    dmpdir regex: SM_OPER_MIR_OSUDP2_*.nc
 - obs space:
     name: adt_rads_all
-    dmpdir subdir: ADT
-    dmpdir regex: rads_adt_??_???????.nc
+    dmpdir subdir: ocean/adt
+    dmpdir regex: rads_adt_*.nc
     provider: RADS
     output file: adt_rads_all.nc4
 - obs space:
     name: icec_amsr2_north
     provider: AMSR2
-    dmpdir subdir: icec
+    dmpdir subdir: ocean/icec
     output file: icec_amsr2_north.ioda.nc
-    dmpdir regex: AMSR2-SEAICE-NH_v2r2_GW1_s???????????????_e???????????????_c???????????????.nc
+    dmpdir regex: AMSR2-SEAICE-NH_v2r2_GW1_s*.nc
 - obs space:
     name: icec_amsr2_south
     provider: AMSR2
-    dmpdir subdir: icec
+    dmpdir subdir: ocean/icec
     output file: icec_amsr2_south.ioda.nc
-    dmpdir regex: AMSR2-SEAICE-SH_v2r2_GW1_s???????????????_e???????????????_c???????????????.nc
+    dmpdir regex: AMSR2-SEAICE-SH_v2r2_GW1_s*.nc
 - obs space:
     name: sst_metopb_l3u
     provider: GHRSST
-    dmpdir subdir: 'sst'
+    dmpdir subdir: 'ocean/sst'
     output file: sst_metopb_l3u.ioda.nc
-    dmpdir regex: '??????????????-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc'
+    dmpdir regex: '*-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V*.nc'
     bounds:
       units: C
       min: -3.0
       max: 50.0
+    binning:
+      stride: 5
+      min number of obs: 10
diff --git a/sorc/gsibec b/sorc/gsibec
index 17823aef7..e760ec73c 160000
--- a/sorc/gsibec
+++ b/sorc/gsibec
@@ -1 +1 @@
-Subproject commit 17823aef706e5d69e373e4c4c5dfadac99d5b800
+Subproject commit e760ec73c117d1456fd6f7ead6bf4c7f4c38e139
diff --git a/sorc/soca b/sorc/soca
index 5783fd72a..44e1a5144 160000
--- a/sorc/soca
+++ b/sorc/soca
@@ -1 +1 @@
-Subproject commit 5783fd72ace301b07a9c264595c82c31e7e872b6
+Subproject commit 44e1a5144ab2682f739af976feff67a537a2f164
diff --git a/test/soca/gw/prepdata.sh b/test/soca/gw/prepdata.sh
index 74f86b3bc..136204329 100755
--- a/test/soca/gw/prepdata.sh
+++ b/test/soca/gw/prepdata.sh
@@ -19,23 +19,23 @@ project_source_dir=$1
 cdldir=${project_source_dir}/test/soca/testdata
 
 # GHRSST
-cdl2nc4 sst/20180415114000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc \
+cdl2nc4 ocean/sst/20180415114000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc \
         ${cdldir}/20180415114000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
-cdl2nc4 sst/20180415132000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc \
+cdl2nc4 ocean/sst/20180415132000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc \
         ${cdldir}/20180415132000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
-cdl2nc4 sst/20180415095000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc \
+cdl2nc4 ocean/sst/20180415095000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc \
         ${cdldir}/20180415095000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
 
 # Fake AMSR2 icec
-cdl2nc4 icec/AMSR2-SEAICE-NH_v2r2_GW1_s201804150835180_e201804151014170_c201804151052280.nc \
+cdl2nc4 ocean/icec/AMSR2-SEAICE-NH_v2r2_GW1_s201804150835180_e201804151014170_c201804151052280.nc \
         ${project_source_dir}/test/soca/testdata/icec_amsr2_north_1.cdl
-cdl2nc4 icec/AMSR2-SEAICE-NH_v2r2_GW1_s201804151014190_e201804151150170_c201804151309570.nc \
+cdl2nc4 ocean/icec/AMSR2-SEAICE-NH_v2r2_GW1_s201804151014190_e201804151150170_c201804151309570.nc \
         ${project_source_dir}/test/soca/testdata/icec_amsr2_north_2.cdl
-cdl2nc4 icec/AMSR2-SEAICE-SH_v2r2_GW1_s201804150835180_e201804151014170_c201804151052280.nc \
+cdl2nc4 ocean/icec/AMSR2-SEAICE-SH_v2r2_GW1_s201804150835180_e201804151014170_c201804151052280.nc \
         ${project_source_dir}/test/soca/testdata/icec_amsr2_south_1.cdl
-cdl2nc4 icec/AMSR2-SEAICE-SH_v2r2_GW1_s201804151014190_e201804151150170_c201804151309570.nc \
+cdl2nc4 ocean/icec/AMSR2-SEAICE-SH_v2r2_GW1_s201804151014190_e201804151150170_c201804151309570.nc \
         ${project_source_dir}/test/soca/testdata/icec_amsr2_south_2.cdl
 
 # Fake RADS ADT
-cdl2nc4 ADT/rads_adt_3a_2018105.nc ${project_source_dir}/test/soca/testdata/rads_adt_3a_2018105.cdl
-cdl2nc4 ADT/rads_adt_3b_2018105.nc ${project_source_dir}/test/soca/testdata/rads_adt_3b_2018105.cdl
+cdl2nc4 ocean/adt/rads_adt_3a_2018105.nc ${project_source_dir}/test/soca/testdata/rads_adt_3a_2018105.cdl
+cdl2nc4 ocean/adt/rads_adt_3b_2018105.nc ${project_source_dir}/test/soca/testdata/rads_adt_3b_2018105.cdl
diff --git a/test/soca/gw/setup_obsprep.sh b/test/soca/gw/setup_obsprep.sh
index f64bc7a54..6a0a3e9e3 100755
--- a/test/soca/gw/setup_obsprep.sh
+++ b/test/soca/gw/setup_obsprep.sh
@@ -11,9 +11,7 @@ mkdir -p ${test_dmpdir}
 
 cd ${test_dmpdir}
 
-mkdir SSS ADT icec sst
+mkdir -p ocean/sss ocean/adt ocean/icec ocean/sst
 
 ${project_source_dir}/test/soca/gw/prepdata.sh ${project_source_dir}
 
-
-