diff --git a/verification/global_oce_latlon/input_ad.w_exf b/verification/global_oce_latlon/input_ad.w_exf
deleted file mode 120000
index c83f604a39..0000000000
--- a/verification/global_oce_latlon/input_ad.w_exf
+++ /dev/null
@@ -1 +0,0 @@
-../global_with_exf/input_ad
\ No newline at end of file
diff --git a/verification/global_with_exf/input_ad/data b/verification/global_oce_latlon/input_ad.w_exf/data
similarity index 100%
rename from verification/global_with_exf/input_ad/data
rename to verification/global_oce_latlon/input_ad.w_exf/data
diff --git a/verification/global_with_exf/input_ad/data.autodiff b/verification/global_oce_latlon/input_ad.w_exf/data.autodiff
similarity index 100%
rename from verification/global_with_exf/input_ad/data.autodiff
rename to verification/global_oce_latlon/input_ad.w_exf/data.autodiff
diff --git a/verification/global_with_exf/input/data.cal b/verification/global_oce_latlon/input_ad.w_exf/data.cal
similarity index 100%
rename from verification/global_with_exf/input/data.cal
rename to verification/global_oce_latlon/input_ad.w_exf/data.cal
diff --git a/verification/global_with_exf/input_ad/data.cost b/verification/global_oce_latlon/input_ad.w_exf/data.cost
similarity index 100%
rename from verification/global_with_exf/input_ad/data.cost
rename to verification/global_oce_latlon/input_ad.w_exf/data.cost
diff --git a/verification/global_with_exf/input_ad/data.ctrl b/verification/global_oce_latlon/input_ad.w_exf/data.ctrl
similarity index 100%
rename from verification/global_with_exf/input_ad/data.ctrl
rename to verification/global_oce_latlon/input_ad.w_exf/data.ctrl
diff --git a/verification/global_with_exf/input_ad/data.exf b/verification/global_oce_latlon/input_ad.w_exf/data.exf
similarity index 100%
rename from verification/global_with_exf/input_ad/data.exf
rename to verification/global_oce_latlon/input_ad.w_exf/data.exf
diff --git a/verification/global_with_exf/input/data.gmredi b/verification/global_oce_latlon/input_ad.w_exf/data.gmredi
similarity index 100%
rename from verification/global_with_exf/input/data.gmredi
rename to verification/global_oce_latlon/input_ad.w_exf/data.gmredi
diff --git a/verification/global_with_exf/input_ad/data.grdchk b/verification/global_oce_latlon/input_ad.w_exf/data.grdchk
similarity index 100%
rename from verification/global_with_exf/input_ad/data.grdchk
rename to verification/global_oce_latlon/input_ad.w_exf/data.grdchk
diff --git a/verification/global_with_exf/input_ad/data.optim b/verification/global_oce_latlon/input_ad.w_exf/data.optim
similarity index 100%
rename from verification/global_with_exf/input_ad/data.optim
rename to verification/global_oce_latlon/input_ad.w_exf/data.optim
diff --git a/verification/global_with_exf/input_ad/data.pkg b/verification/global_oce_latlon/input_ad.w_exf/data.pkg
similarity index 100%
rename from verification/global_with_exf/input_ad/data.pkg
rename to verification/global_oce_latlon/input_ad.w_exf/data.pkg
diff --git a/verification/global_with_exf/input_ad/eedata b/verification/global_oce_latlon/input_ad.w_exf/eedata
similarity index 100%
rename from verification/global_with_exf/input_ad/eedata
rename to verification/global_oce_latlon/input_ad.w_exf/eedata
diff --git a/verification/global_with_exf/input_ad/prepare_run b/verification/global_oce_latlon/input_ad.w_exf/prepare_run
similarity index 100%
rename from verification/global_with_exf/input_ad/prepare_run
rename to verification/global_oce_latlon/input_ad.w_exf/prepare_run
diff --git a/verification/global_ocean_ebm/input.w_exf b/verification/global_ocean_ebm/input.w_exf
deleted file mode 120000
index 24c8c3d5f0..0000000000
--- a/verification/global_ocean_ebm/input.w_exf
+++ /dev/null
@@ -1 +0,0 @@
-../global_with_exf/input
\ No newline at end of file
diff --git a/verification/global_with_exf/input/POLY3.COEFFS b/verification/global_ocean_ebm/input.w_exf/POLY3.COEFFS
similarity index 100%
rename from verification/global_with_exf/input/POLY3.COEFFS
rename to verification/global_ocean_ebm/input.w_exf/POLY3.COEFFS
diff --git a/verification/global_with_exf/input/data b/verification/global_ocean_ebm/input.w_exf/data
similarity index 100%
rename from verification/global_with_exf/input/data
rename to verification/global_ocean_ebm/input.w_exf/data
diff --git a/verification/global_with_exf/input_ad/data.cal b/verification/global_ocean_ebm/input.w_exf/data.cal
similarity index 100%
rename from verification/global_with_exf/input_ad/data.cal
rename to verification/global_ocean_ebm/input.w_exf/data.cal
diff --git a/verification/global_with_exf/input/data.diagnostics b/verification/global_ocean_ebm/input.w_exf/data.diagnostics
similarity index 100%
rename from verification/global_with_exf/input/data.diagnostics
rename to verification/global_ocean_ebm/input.w_exf/data.diagnostics
diff --git a/verification/global_with_exf/input/data.exf b/verification/global_ocean_ebm/input.w_exf/data.exf
similarity index 100%
rename from verification/global_with_exf/input/data.exf
rename to verification/global_ocean_ebm/input.w_exf/data.exf
diff --git a/verification/global_with_exf/input_ad/data.gmredi b/verification/global_ocean_ebm/input.w_exf/data.gmredi
similarity index 100%
rename from verification/global_with_exf/input_ad/data.gmredi
rename to verification/global_ocean_ebm/input.w_exf/data.gmredi
diff --git a/verification/global_with_exf/input/data.pkg b/verification/global_ocean_ebm/input.w_exf/data.pkg
similarity index 100%
rename from verification/global_with_exf/input/data.pkg
rename to verification/global_ocean_ebm/input.w_exf/data.pkg
diff --git a/verification/global_with_exf/input/data.profiles b/verification/global_ocean_ebm/input.w_exf/data.profiles
similarity index 100%
rename from verification/global_with_exf/input/data.profiles
rename to verification/global_ocean_ebm/input.w_exf/data.profiles
diff --git a/verification/global_with_exf/input/eedata b/verification/global_ocean_ebm/input.w_exf/eedata
similarity index 100%
rename from verification/global_with_exf/input/eedata
rename to verification/global_ocean_ebm/input.w_exf/eedata
diff --git a/verification/global_with_exf/input.yearly/eedata.mth b/verification/global_ocean_ebm/input.w_exf/eedata.mth
similarity index 100%
rename from verification/global_with_exf/input.yearly/eedata.mth
rename to verification/global_ocean_ebm/input.w_exf/eedata.mth
diff --git a/verification/global_with_exf/input/prepare_run b/verification/global_ocean_ebm/input.w_exf/prepare_run
similarity index 100%
rename from verification/global_with_exf/input/prepare_run
rename to verification/global_ocean_ebm/input.w_exf/prepare_run
diff --git a/verification/global_with_exf/input/prof_exemple.nc b/verification/global_ocean_ebm/input.w_exf/prof_exemple.nc
similarity index 100%
rename from verification/global_with_exf/input/prof_exemple.nc
rename to verification/global_ocean_ebm/input.w_exf/prof_exemple.nc
diff --git a/verification/global_ocean_ebm/input.yearly b/verification/global_ocean_ebm/input.yearly
deleted file mode 120000
index ac3e831613..0000000000
--- a/verification/global_ocean_ebm/input.yearly
+++ /dev/null
@@ -1 +0,0 @@
-../global_with_exf/input.yearly
\ No newline at end of file
diff --git a/verification/global_with_exf/input.yearly/data b/verification/global_ocean_ebm/input.yearly/data
similarity index 100%
rename from verification/global_with_exf/input.yearly/data
rename to verification/global_ocean_ebm/input.yearly/data
diff --git a/verification/global_with_exf/input.yearly/data.bbl b/verification/global_ocean_ebm/input.yearly/data.bbl
similarity index 100%
rename from verification/global_with_exf/input.yearly/data.bbl
rename to verification/global_ocean_ebm/input.yearly/data.bbl
diff --git a/verification/global_with_exf/input.yearly/data.cal b/verification/global_ocean_ebm/input.yearly/data.cal
similarity index 100%
rename from verification/global_with_exf/input.yearly/data.cal
rename to verification/global_ocean_ebm/input.yearly/data.cal
diff --git a/verification/global_with_exf/input.yearly/data.diagnostics b/verification/global_ocean_ebm/input.yearly/data.diagnostics
similarity index 100%
rename from verification/global_with_exf/input.yearly/data.diagnostics
rename to verification/global_ocean_ebm/input.yearly/data.diagnostics
diff --git a/verification/global_with_exf/input.yearly/data.exf b/verification/global_ocean_ebm/input.yearly/data.exf
similarity index 100%
rename from verification/global_with_exf/input.yearly/data.exf
rename to verification/global_ocean_ebm/input.yearly/data.exf
diff --git a/verification/global_with_exf/input.yearly/data.pkg b/verification/global_ocean_ebm/input.yearly/data.pkg
similarity index 100%
rename from verification/global_with_exf/input.yearly/data.pkg
rename to verification/global_ocean_ebm/input.yearly/data.pkg
diff --git a/verification/global_with_exf/input/eedata.mth b/verification/global_ocean_ebm/input.yearly/eedata.mth
similarity index 100%
rename from verification/global_with_exf/input/eedata.mth
rename to verification/global_ocean_ebm/input.yearly/eedata.mth
diff --git a/verification/global_with_exf/input.yearly/prepare_run b/verification/global_ocean_ebm/input.yearly/prepare_run
similarity index 100%
rename from verification/global_with_exf/input.yearly/prepare_run
rename to verification/global_ocean_ebm/input.yearly/prepare_run
diff --git a/verification/lab_sea/input.natl_box b/verification/lab_sea/input.natl_box
deleted file mode 120000
index 4941136802..0000000000
--- a/verification/lab_sea/input.natl_box
+++ /dev/null
@@ -1 +0,0 @@
-../natl_box/input
\ No newline at end of file
diff --git a/verification/natl_box/input/POLY3.COEFFS b/verification/lab_sea/input.natl_box/POLY3.COEFFS
similarity index 100%
rename from verification/natl_box/input/POLY3.COEFFS
rename to verification/lab_sea/input.natl_box/POLY3.COEFFS
diff --git a/verification/natl_box/input/closest.m b/verification/lab_sea/input.natl_box/closest.m
similarity index 100%
rename from verification/natl_box/input/closest.m
rename to verification/lab_sea/input.natl_box/closest.m
diff --git a/verification/natl_box/input/data b/verification/lab_sea/input.natl_box/data
similarity index 100%
rename from verification/natl_box/input/data
rename to verification/lab_sea/input.natl_box/data
diff --git a/verification/natl_box/input/data.diagnostics b/verification/lab_sea/input.natl_box/data.diagnostics
similarity index 100%
rename from verification/natl_box/input/data.diagnostics
rename to verification/lab_sea/input.natl_box/data.diagnostics
diff --git a/verification/natl_box/input/data.kpp b/verification/lab_sea/input.natl_box/data.kpp
similarity index 100%
rename from verification/natl_box/input/data.kpp
rename to verification/lab_sea/input.natl_box/data.kpp
diff --git a/verification/natl_box/input/data.pkg b/verification/lab_sea/input.natl_box/data.pkg
similarity index 100%
rename from verification/natl_box/input/data.pkg
rename to verification/lab_sea/input.natl_box/data.pkg
diff --git a/verification/natl_box/input/eedata b/verification/lab_sea/input.natl_box/eedata
similarity index 100%
rename from verification/natl_box/input/eedata
rename to verification/lab_sea/input.natl_box/eedata
diff --git a/verification/natl_box/input/eedata.mth b/verification/lab_sea/input.natl_box/eedata.mth
similarity index 100%
rename from verification/natl_box/input/eedata.mth
rename to verification/lab_sea/input.natl_box/eedata.mth
diff --git a/verification/natl_box/input/kf_climsalt b/verification/lab_sea/input.natl_box/kf_climsalt
similarity index 100%
rename from verification/natl_box/input/kf_climsalt
rename to verification/lab_sea/input.natl_box/kf_climsalt
diff --git a/verification/natl_box/input/kf_climtheta b/verification/lab_sea/input.natl_box/kf_climtheta
similarity index 100%
rename from verification/natl_box/input/kf_climtheta
rename to verification/lab_sea/input.natl_box/kf_climtheta
diff --git a/verification/natl_box/input/kf_empmr b/verification/lab_sea/input.natl_box/kf_empmr
similarity index 100%
rename from verification/natl_box/input/kf_empmr
rename to verification/lab_sea/input.natl_box/kf_empmr
diff --git a/verification/natl_box/input/kf_qnet b/verification/lab_sea/input.natl_box/kf_qnet
similarity index 100%
rename from verification/natl_box/input/kf_qnet
rename to verification/lab_sea/input.natl_box/kf_qnet
diff --git a/verification/natl_box/input/kf_sss b/verification/lab_sea/input.natl_box/kf_sss
similarity index 100%
rename from verification/natl_box/input/kf_sss
rename to verification/lab_sea/input.natl_box/kf_sss
diff --git a/verification/natl_box/input/kf_sst b/verification/lab_sea/input.natl_box/kf_sst
similarity index 100%
rename from verification/natl_box/input/kf_sst
rename to verification/lab_sea/input.natl_box/kf_sst
diff --git a/verification/natl_box/input/kf_sw b/verification/lab_sea/input.natl_box/kf_sw
similarity index 100%
rename from verification/natl_box/input/kf_sw
rename to verification/lab_sea/input.natl_box/kf_sw
diff --git a/verification/natl_box/input/kf_topog b/verification/lab_sea/input.natl_box/kf_topog
similarity index 100%
rename from verification/natl_box/input/kf_topog
rename to verification/lab_sea/input.natl_box/kf_topog
diff --git a/verification/natl_box/input/kf_tx b/verification/lab_sea/input.natl_box/kf_tx
similarity index 100%
rename from verification/natl_box/input/kf_tx
rename to verification/lab_sea/input.natl_box/kf_tx
diff --git a/verification/natl_box/input/kf_ty b/verification/lab_sea/input.natl_box/kf_ty
similarity index 100%
rename from verification/natl_box/input/kf_ty
rename to verification/lab_sea/input.natl_box/kf_ty
diff --git a/verification/natl_box/input/lookat.m b/verification/lab_sea/input.natl_box/lookat.m
similarity index 100%
rename from verification/natl_box/input/lookat.m
rename to verification/lab_sea/input.natl_box/lookat.m
diff --git a/verification/natl_box/input/mk_std_forc.m b/verification/lab_sea/input.natl_box/mk_std_forc.m
similarity index 100%
rename from verification/natl_box/input/mk_std_forc.m
rename to verification/lab_sea/input.natl_box/mk_std_forc.m
diff --git a/verification/natl_box/input/rho.m b/verification/lab_sea/input.natl_box/rho.m
similarity index 100%
rename from verification/natl_box/input/rho.m
rename to verification/lab_sea/input.natl_box/rho.m
diff --git a/verification/natl_box/input/tr_checklist b/verification/lab_sea/input.natl_box/tr_checklist
similarity index 100%
rename from verification/natl_box/input/tr_checklist
rename to verification/lab_sea/input.natl_box/tr_checklist