diff --git a/recipes_nrt/deploy/deploy_cps_test.yaml b/recipes_nrt/cps/deploy.yaml
similarity index 100%
rename from recipes_nrt/deploy/deploy_cps_test.yaml
rename to recipes_nrt/cps/deploy.yaml
diff --git a/recipes_nrt/params/params_cps_test.yaml b/recipes_nrt/cps/params.yaml
similarity index 100%
rename from recipes_nrt/params/params_cps_test.yaml
rename to recipes_nrt/cps/params.yaml
diff --git a/recipes_nrt/deploy/deploy_cloud_nrt.yaml b/recipes_nrt/hake/cloud/deploy.yaml
similarity index 100%
rename from recipes_nrt/deploy/deploy_cloud_nrt.yaml
rename to recipes_nrt/hake/cloud/deploy.yaml
diff --git a/recipes_nrt/params/params_cloud_nrt.yaml b/recipes_nrt/hake/cloud/params.yaml
similarity index 100%
rename from recipes_nrt/params/params_cloud_nrt.yaml
rename to recipes_nrt/hake/cloud/params.yaml
diff --git a/recipes_nrt/deploy/deploy_cloud_echogram_viz_only.yaml b/recipes_nrt/hake/cloud/viz_deploy.yaml
similarity index 100%
rename from recipes_nrt/deploy/deploy_cloud_echogram_viz_only.yaml
rename to recipes_nrt/hake/cloud/viz_deploy.yaml
diff --git a/recipes_nrt/deploy/deploy_cloud_echogram_viz_only_2vessels.yaml b/recipes_nrt/hake/cloud/viz_deploy_2vessels.yaml
similarity index 100%
rename from recipes_nrt/deploy/deploy_cloud_echogram_viz_only_2vessels.yaml
rename to recipes_nrt/hake/cloud/viz_deploy_2vessels.yaml
diff --git a/recipes_nrt/params/params_cloud_echogram_viz_only.yaml b/recipes_nrt/hake/cloud/viz_params.yaml
similarity index 100%
rename from recipes_nrt/params/params_cloud_echogram_viz_only.yaml
rename to recipes_nrt/hake/cloud/viz_params.yaml
diff --git a/recipes_nrt/params/params_cloud_echogram_viz_only_2vessels.yaml b/recipes_nrt/hake/cloud/viz_params_2vessels.yaml
similarity index 100%
rename from recipes_nrt/params/params_cloud_echogram_viz_only_2vessels.yaml
rename to recipes_nrt/hake/cloud/viz_params_2vessels.yaml
diff --git a/recipes_nrt/deploy/deploy_edge_nrt.yaml b/recipes_nrt/hake/edge/deploy.yaml
similarity index 100%
rename from recipes_nrt/deploy/deploy_edge_nrt.yaml
rename to recipes_nrt/hake/edge/deploy.yaml
diff --git a/recipes_nrt/params/params_edge_nrt.yaml b/recipes_nrt/hake/edge/params.yaml
similarity index 100%
rename from recipes_nrt/params/params_edge_nrt.yaml
rename to recipes_nrt/hake/edge/params.yaml
diff --git a/recipes_nrt/deploy/deploy_spasso_iwcps_2026.yaml b/recipes_nrt/spasso/deploy.yaml
similarity index 100%
rename from recipes_nrt/deploy/deploy_spasso_iwcps_2026.yaml
rename to recipes_nrt/spasso/deploy.yaml
diff --git a/recipes_nrt/params/params_spasso_iwcps_2026.yaml b/recipes_nrt/spasso/params.yaml
similarity index 100%
rename from recipes_nrt/params/params_spasso_iwcps_2026.yaml
rename to recipes_nrt/spasso/params.yaml
diff --git a/recipes_postproc/deploy/deploy_postproc_edge.yaml b/recipes_postproc/hake/deploy.yaml
similarity index 100%
rename from recipes_postproc/deploy/deploy_postproc_edge.yaml
rename to recipes_postproc/hake/deploy.yaml
diff --git a/recipes_postproc/params/params_postproc_edge.yaml b/recipes_postproc/hake/params.yaml
similarity index 100%
rename from recipes_postproc/params/params_postproc_edge.yaml
rename to recipes_postproc/hake/params.yaml
diff --git a/scripts/watch_raw_updates.py b/scripts/monitoring/watch_raw_updates.py
similarity index 100%
rename from scripts/watch_raw_updates.py
rename to scripts/monitoring/watch_raw_updates.py
diff --git a/scripts/watch_transect_updates.py b/scripts/monitoring/watch_transect_updates.py
similarity index 100%
rename from scripts/watch_transect_updates.py
rename to scripts/monitoring/watch_transect_updates.py
diff --git a/scripts/watch_ship_navigation.py b/scripts/navigation/watch_ship_navigation.py
similarity index 100%
rename from scripts/watch_ship_navigation.py
rename to scripts/navigation/watch_ship_navigation.py