diff --git a/volcanic/decollement-sources/README.md b/volcanic/decollement/README.md
similarity index 100%
rename from volcanic/decollement-sources/README.md
rename to volcanic/decollement/README.md
diff --git a/volcanic/decollement-sources/decollement-config.json b/volcanic/decollement/decollement-config.json
similarity index 100%
rename from volcanic/decollement-sources/decollement-config.json
rename to volcanic/decollement/decollement-config.json
diff --git a/volcanic/decollement-sources/gmm-config.json b/volcanic/decollement/gmm-config.json
similarity index 100%
rename from volcanic/decollement-sources/gmm-config.json
rename to volcanic/decollement/gmm-config.json
diff --git a/volcanic/decollement-sources/gmm-tree.json b/volcanic/decollement/gmm-tree.json
similarity index 100%
rename from volcanic/decollement-sources/gmm-tree.json
rename to volcanic/decollement/gmm-tree.json
diff --git a/volcanic/decollement-sources/south-flank/extended/rupture-set.json b/volcanic/decollement/south-flank/extended/rupture-set.json
similarity index 100%
rename from volcanic/decollement-sources/south-flank/extended/rupture-set.json
rename to volcanic/decollement/south-flank/extended/rupture-set.json
diff --git a/volcanic/decollement-sources/south-flank/features/South Flank (extended).geojson b/volcanic/decollement/south-flank/features/South Flank (extended).geojson
similarity index 100%
rename from volcanic/decollement-sources/south-flank/features/South Flank (extended).geojson
rename to volcanic/decollement/south-flank/features/South Flank (extended).geojson
diff --git a/volcanic/decollement-sources/south-flank/features/South Flank (merged).geojson b/volcanic/decollement/south-flank/features/South Flank (merged).geojson
similarity index 100%
rename from volcanic/decollement-sources/south-flank/features/South Flank (merged).geojson
rename to volcanic/decollement/south-flank/features/South Flank (merged).geojson
diff --git a/volcanic/decollement-sources/south-flank/merged/rupture-set.json b/volcanic/decollement/south-flank/merged/rupture-set.json
similarity index 100%
rename from volcanic/decollement-sources/south-flank/merged/rupture-set.json
rename to volcanic/decollement/south-flank/merged/rupture-set.json
diff --git a/volcanic/decollement-sources/south-flank/mfd-config.json b/volcanic/decollement/south-flank/mfd-config.json
similarity index 100%
rename from volcanic/decollement-sources/south-flank/mfd-config.json
rename to volcanic/decollement/south-flank/mfd-config.json
diff --git a/volcanic/decollement-sources/south-flank/mfd-map.json b/volcanic/decollement/south-flank/mfd-map.json
similarity index 100%
rename from volcanic/decollement-sources/south-flank/mfd-map.json
rename to volcanic/decollement/south-flank/mfd-map.json
diff --git a/volcanic/decollement-sources/south-flank/source-tree.json b/volcanic/decollement/south-flank/source-tree.json
similarity index 100%
rename from volcanic/decollement-sources/south-flank/source-tree.json
rename to volcanic/decollement/south-flank/source-tree.json
diff --git a/volcanic/decollement-sources/south-flank/tree-info.json b/volcanic/decollement/south-flank/tree-info.json
similarity index 100%
rename from volcanic/decollement-sources/south-flank/tree-info.json
rename to volcanic/decollement/south-flank/tree-info.json
diff --git a/volcanic/decollement-sources/west-flank/extended/rupture-set.json b/volcanic/decollement/west-flank/extended/rupture-set.json
similarity index 100%
rename from volcanic/decollement-sources/west-flank/extended/rupture-set.json
rename to volcanic/decollement/west-flank/extended/rupture-set.json
diff --git a/volcanic/decollement-sources/west-flank/features/West Flank (Hualalai).geojson b/volcanic/decollement/west-flank/features/West Flank (Hualalai).geojson
similarity index 100%
rename from volcanic/decollement-sources/west-flank/features/West Flank (Hualalai).geojson
rename to volcanic/decollement/west-flank/features/West Flank (Hualalai).geojson
diff --git a/volcanic/decollement-sources/west-flank/features/West Flank (Kona).geojson b/volcanic/decollement/west-flank/features/West Flank (Kona).geojson
similarity index 100%
rename from volcanic/decollement-sources/west-flank/features/West Flank (Kona).geojson
rename to volcanic/decollement/west-flank/features/West Flank (Kona).geojson
diff --git a/volcanic/decollement-sources/west-flank/features/West Flank (extended).geojson b/volcanic/decollement/west-flank/features/West Flank (extended).geojson
similarity index 100%
rename from volcanic/decollement-sources/west-flank/features/West Flank (extended).geojson
rename to volcanic/decollement/west-flank/features/West Flank (extended).geojson
diff --git a/volcanic/decollement-sources/west-flank/features/West Flank (merged).geojson b/volcanic/decollement/west-flank/features/West Flank (merged).geojson
similarity index 100%
rename from volcanic/decollement-sources/west-flank/features/West Flank (merged).geojson
rename to volcanic/decollement/west-flank/features/West Flank (merged).geojson
diff --git a/volcanic/decollement-sources/west-flank/merged/rupture-set.json b/volcanic/decollement/west-flank/merged/rupture-set.json
similarity index 100%
rename from volcanic/decollement-sources/west-flank/merged/rupture-set.json
rename to volcanic/decollement/west-flank/merged/rupture-set.json
diff --git a/volcanic/decollement-sources/west-flank/mfd-config.json b/volcanic/decollement/west-flank/mfd-config.json
similarity index 100%
rename from volcanic/decollement-sources/west-flank/mfd-config.json
rename to volcanic/decollement/west-flank/mfd-config.json
diff --git a/volcanic/decollement-sources/west-flank/mfd-map.json b/volcanic/decollement/west-flank/mfd-map.json
similarity index 100%
rename from volcanic/decollement-sources/west-flank/mfd-map.json
rename to volcanic/decollement/west-flank/mfd-map.json
diff --git a/volcanic/decollement-sources/west-flank/segmented/hualalai/rupture-set.json b/volcanic/decollement/west-flank/segmented/hualalai/rupture-set.json
similarity index 100%
rename from volcanic/decollement-sources/west-flank/segmented/hualalai/rupture-set.json
rename to volcanic/decollement/west-flank/segmented/hualalai/rupture-set.json
diff --git a/volcanic/decollement-sources/west-flank/segmented/kona/rupture-set.json b/volcanic/decollement/west-flank/segmented/kona/rupture-set.json
similarity index 100%
rename from volcanic/decollement-sources/west-flank/segmented/kona/rupture-set.json
rename to volcanic/decollement/west-flank/segmented/kona/rupture-set.json
diff --git a/volcanic/decollement-sources/west-flank/segmented/mfd-config.json b/volcanic/decollement/west-flank/segmented/mfd-config.json
similarity index 100%
rename from volcanic/decollement-sources/west-flank/segmented/mfd-config.json
rename to volcanic/decollement/west-flank/segmented/mfd-config.json
diff --git a/volcanic/decollement-sources/west-flank/segmented/source-group.json b/volcanic/decollement/west-flank/segmented/source-group.json
similarity index 100%
rename from volcanic/decollement-sources/west-flank/segmented/source-group.json
rename to volcanic/decollement/west-flank/segmented/source-group.json
diff --git a/volcanic/decollement-sources/west-flank/source-tree.json b/volcanic/decollement/west-flank/source-tree.json
similarity index 100%
rename from volcanic/decollement-sources/west-flank/source-tree.json
rename to volcanic/decollement/west-flank/source-tree.json
diff --git a/volcanic/decollement-sources/west-flank/tree-info.json b/volcanic/decollement/west-flank/tree-info.json
similarity index 100%
rename from volcanic/decollement-sources/west-flank/tree-info.json
rename to volcanic/decollement/west-flank/tree-info.json
diff --git a/volcanic/grid-sources/README.md b/volcanic/grid/README.md
similarity index 100%
rename from volcanic/grid-sources/README.md
rename to volcanic/grid/README.md
diff --git a/volcanic/grid-sources/features/non-summit.geojson b/volcanic/grid/features/non-summit.geojson
similarity index 100%
rename from volcanic/grid-sources/features/non-summit.geojson
rename to volcanic/grid/features/non-summit.geojson
diff --git a/volcanic/grid-sources/features/summit.geojson b/volcanic/grid/features/summit.geojson
similarity index 100%
rename from volcanic/grid-sources/features/summit.geojson
rename to volcanic/grid/features/summit.geojson
diff --git a/volcanic/grid-sources/grid-config.json b/volcanic/grid/grid-config.json
similarity index 100%
rename from volcanic/grid-sources/grid-config.json
rename to volcanic/grid/grid-config.json
diff --git a/volcanic/grid-sources/grid-data/non-summit-deep-nn-pdf.csv b/volcanic/grid/grid-data/non-summit-deep-nn-pdf.csv
similarity index 100%
rename from volcanic/grid-sources/grid-data/non-summit-deep-nn-pdf.csv
rename to volcanic/grid/grid-data/non-summit-deep-nn-pdf.csv
diff --git a/volcanic/grid-sources/grid-data/non-summit-deep-r85-pdf.csv b/volcanic/grid/grid-data/non-summit-deep-r85-pdf.csv
similarity index 100%
rename from volcanic/grid-sources/grid-data/non-summit-deep-r85-pdf.csv
rename to volcanic/grid/grid-data/non-summit-deep-r85-pdf.csv
diff --git a/volcanic/grid-sources/grid-data/non-summit-shallow-north-nn-pdf.csv b/volcanic/grid/grid-data/non-summit-shallow-north-nn-pdf.csv
similarity index 100%
rename from volcanic/grid-sources/grid-data/non-summit-shallow-north-nn-pdf.csv
rename to volcanic/grid/grid-data/non-summit-shallow-north-nn-pdf.csv
diff --git a/volcanic/grid-sources/grid-data/non-summit-shallow-north-r85-pdf.csv b/volcanic/grid/grid-data/non-summit-shallow-north-r85-pdf.csv
similarity index 100%
rename from volcanic/grid-sources/grid-data/non-summit-shallow-north-r85-pdf.csv
rename to volcanic/grid/grid-data/non-summit-shallow-north-r85-pdf.csv
diff --git a/volcanic/grid-sources/grid-data/non-summit-shallow-south-nn-pdf.csv b/volcanic/grid/grid-data/non-summit-shallow-south-nn-pdf.csv
similarity index 100%
rename from volcanic/grid-sources/grid-data/non-summit-shallow-south-nn-pdf.csv
rename to volcanic/grid/grid-data/non-summit-shallow-south-nn-pdf.csv
diff --git a/volcanic/grid-sources/grid-data/non-summit-shallow-south-r85-pdf.csv b/volcanic/grid/grid-data/non-summit-shallow-south-r85-pdf.csv
similarity index 100%
rename from volcanic/grid-sources/grid-data/non-summit-shallow-south-r85-pdf.csv
rename to volcanic/grid/grid-data/non-summit-shallow-south-r85-pdf.csv
diff --git a/volcanic/grid-sources/grid-data/summit-deep-nn-pdf.csv b/volcanic/grid/grid-data/summit-deep-nn-pdf.csv
similarity index 100%
rename from volcanic/grid-sources/grid-data/summit-deep-nn-pdf.csv
rename to volcanic/grid/grid-data/summit-deep-nn-pdf.csv
diff --git a/volcanic/grid-sources/grid-data/summit-deep-r85-pdf.csv b/volcanic/grid/grid-data/summit-deep-r85-pdf.csv
similarity index 100%
rename from volcanic/grid-sources/grid-data/summit-deep-r85-pdf.csv
rename to volcanic/grid/grid-data/summit-deep-r85-pdf.csv
diff --git a/volcanic/grid-sources/grid-data/summit-shallow-nn-pdf.csv b/volcanic/grid/grid-data/summit-shallow-nn-pdf.csv
similarity index 100%
rename from volcanic/grid-sources/grid-data/summit-shallow-nn-pdf.csv
rename to volcanic/grid/grid-data/summit-shallow-nn-pdf.csv
diff --git a/volcanic/grid-sources/grid-data/summit-shallow-r85-pdf.csv b/volcanic/grid/grid-data/summit-shallow-r85-pdf.csv
similarity index 100%
rename from volcanic/grid-sources/grid-data/summit-shallow-r85-pdf.csv
rename to volcanic/grid/grid-data/summit-shallow-r85-pdf.csv
diff --git a/volcanic/grid-sources/mfd-map.json b/volcanic/grid/mfd-map.json
similarity index 100%
rename from volcanic/grid-sources/mfd-map.json
rename to volcanic/grid/mfd-map.json
diff --git a/volcanic/grid-sources/non-summit/deep/gmm-config.json b/volcanic/grid/non-summit/deep/gmm-config.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/deep/gmm-config.json
rename to volcanic/grid/non-summit/deep/gmm-config.json
diff --git a/volcanic/grid-sources/non-summit/deep/gmm-tree.json b/volcanic/grid/non-summit/deep/gmm-tree.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/deep/gmm-tree.json
rename to volcanic/grid/non-summit/deep/gmm-tree.json
diff --git a/volcanic/grid-sources/non-summit/deep/grid-config.json b/volcanic/grid/non-summit/deep/grid-config.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/deep/grid-config.json
rename to volcanic/grid/non-summit/deep/grid-config.json
diff --git a/volcanic/grid-sources/non-summit/deep/nn/rate-tree.json b/volcanic/grid/non-summit/deep/nn/rate-tree.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/deep/nn/rate-tree.json
rename to volcanic/grid/non-summit/deep/nn/rate-tree.json
diff --git a/volcanic/grid-sources/non-summit/deep/nn/rupture-sets.json b/volcanic/grid/non-summit/deep/nn/rupture-sets.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/deep/nn/rupture-sets.json
rename to volcanic/grid/non-summit/deep/nn/rupture-sets.json
diff --git a/volcanic/grid-sources/non-summit/deep/r85/rate-tree.json b/volcanic/grid/non-summit/deep/r85/rate-tree.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/deep/r85/rate-tree.json
rename to volcanic/grid/non-summit/deep/r85/rate-tree.json
diff --git a/volcanic/grid-sources/non-summit/deep/r85/rupture-sets.json b/volcanic/grid/non-summit/deep/r85/rupture-sets.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/deep/r85/rupture-sets.json
rename to volcanic/grid/non-summit/deep/r85/rupture-sets.json
diff --git a/volcanic/grid-sources/non-summit/deep/source-tree.json b/volcanic/grid/non-summit/deep/source-tree.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/deep/source-tree.json
rename to volcanic/grid/non-summit/deep/source-tree.json
diff --git a/volcanic/grid-sources/non-summit/deep/tree-info.json b/volcanic/grid/non-summit/deep/tree-info.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/deep/tree-info.json
rename to volcanic/grid/non-summit/deep/tree-info.json
diff --git a/volcanic/grid-sources/non-summit/shallow/gmm-config.json b/volcanic/grid/non-summit/shallow/gmm-config.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/gmm-config.json
rename to volcanic/grid/non-summit/shallow/gmm-config.json
diff --git a/volcanic/grid-sources/non-summit/shallow/gmm-tree.json b/volcanic/grid/non-summit/shallow/gmm-tree.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/gmm-tree.json
rename to volcanic/grid/non-summit/shallow/gmm-tree.json
diff --git a/volcanic/grid-sources/non-summit/shallow/north/nn/rate-tree.json b/volcanic/grid/non-summit/shallow/north/nn/rate-tree.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/north/nn/rate-tree.json
rename to volcanic/grid/non-summit/shallow/north/nn/rate-tree.json
diff --git a/volcanic/grid-sources/non-summit/shallow/north/nn/rupture-sets.json b/volcanic/grid/non-summit/shallow/north/nn/rupture-sets.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/north/nn/rupture-sets.json
rename to volcanic/grid/non-summit/shallow/north/nn/rupture-sets.json
diff --git a/volcanic/grid-sources/non-summit/shallow/north/r85/rate-tree.json b/volcanic/grid/non-summit/shallow/north/r85/rate-tree.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/north/r85/rate-tree.json
rename to volcanic/grid/non-summit/shallow/north/r85/rate-tree.json
diff --git a/volcanic/grid-sources/non-summit/shallow/north/r85/rupture-sets.json b/volcanic/grid/non-summit/shallow/north/r85/rupture-sets.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/north/r85/rupture-sets.json
rename to volcanic/grid/non-summit/shallow/north/r85/rupture-sets.json
diff --git a/volcanic/grid-sources/non-summit/shallow/north/source-tree.json b/volcanic/grid/non-summit/shallow/north/source-tree.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/north/source-tree.json
rename to volcanic/grid/non-summit/shallow/north/source-tree.json
diff --git a/volcanic/grid-sources/non-summit/shallow/north/tree-info.json b/volcanic/grid/non-summit/shallow/north/tree-info.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/north/tree-info.json
rename to volcanic/grid/non-summit/shallow/north/tree-info.json
diff --git a/volcanic/grid-sources/non-summit/shallow/south/nn/rate-tree.json b/volcanic/grid/non-summit/shallow/south/nn/rate-tree.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/south/nn/rate-tree.json
rename to volcanic/grid/non-summit/shallow/south/nn/rate-tree.json
diff --git a/volcanic/grid-sources/non-summit/shallow/south/nn/rupture-sets.json b/volcanic/grid/non-summit/shallow/south/nn/rupture-sets.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/south/nn/rupture-sets.json
rename to volcanic/grid/non-summit/shallow/south/nn/rupture-sets.json
diff --git a/volcanic/grid-sources/non-summit/shallow/south/r85/rate-tree.json b/volcanic/grid/non-summit/shallow/south/r85/rate-tree.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/south/r85/rate-tree.json
rename to volcanic/grid/non-summit/shallow/south/r85/rate-tree.json
diff --git a/volcanic/grid-sources/non-summit/shallow/south/r85/rupture-sets.json b/volcanic/grid/non-summit/shallow/south/r85/rupture-sets.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/south/r85/rupture-sets.json
rename to volcanic/grid/non-summit/shallow/south/r85/rupture-sets.json
diff --git a/volcanic/grid-sources/non-summit/shallow/south/source-tree.json b/volcanic/grid/non-summit/shallow/south/source-tree.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/south/source-tree.json
rename to volcanic/grid/non-summit/shallow/south/source-tree.json
diff --git a/volcanic/grid-sources/non-summit/shallow/south/tree-info.json b/volcanic/grid/non-summit/shallow/south/tree-info.json
similarity index 100%
rename from volcanic/grid-sources/non-summit/shallow/south/tree-info.json
rename to volcanic/grid/non-summit/shallow/south/tree-info.json
diff --git a/volcanic/grid-sources/summit/deep/gmm-config.json b/volcanic/grid/summit/deep/gmm-config.json
similarity index 100%
rename from volcanic/grid-sources/summit/deep/gmm-config.json
rename to volcanic/grid/summit/deep/gmm-config.json
diff --git a/volcanic/grid-sources/summit/deep/gmm-tree.json b/volcanic/grid/summit/deep/gmm-tree.json
similarity index 100%
rename from volcanic/grid-sources/summit/deep/gmm-tree.json
rename to volcanic/grid/summit/deep/gmm-tree.json
diff --git a/volcanic/grid-sources/summit/deep/grid-config.json b/volcanic/grid/summit/deep/grid-config.json
similarity index 100%
rename from volcanic/grid-sources/summit/deep/grid-config.json
rename to volcanic/grid/summit/deep/grid-config.json
diff --git a/volcanic/grid-sources/summit/deep/nn/rate-tree.json b/volcanic/grid/summit/deep/nn/rate-tree.json
similarity index 100%
rename from volcanic/grid-sources/summit/deep/nn/rate-tree.json
rename to volcanic/grid/summit/deep/nn/rate-tree.json
diff --git a/volcanic/grid-sources/summit/deep/nn/rupture-sets.json b/volcanic/grid/summit/deep/nn/rupture-sets.json
similarity index 100%
rename from volcanic/grid-sources/summit/deep/nn/rupture-sets.json
rename to volcanic/grid/summit/deep/nn/rupture-sets.json
diff --git a/volcanic/grid-sources/summit/deep/r85/rate-tree.json b/volcanic/grid/summit/deep/r85/rate-tree.json
similarity index 100%
rename from volcanic/grid-sources/summit/deep/r85/rate-tree.json
rename to volcanic/grid/summit/deep/r85/rate-tree.json
diff --git a/volcanic/grid-sources/summit/deep/r85/rupture-sets.json b/volcanic/grid/summit/deep/r85/rupture-sets.json
similarity index 100%
rename from volcanic/grid-sources/summit/deep/r85/rupture-sets.json
rename to volcanic/grid/summit/deep/r85/rupture-sets.json
diff --git a/volcanic/grid-sources/summit/deep/source-tree.json b/volcanic/grid/summit/deep/source-tree.json
similarity index 100%
rename from volcanic/grid-sources/summit/deep/source-tree.json
rename to volcanic/grid/summit/deep/source-tree.json
diff --git a/volcanic/grid-sources/summit/deep/tree-info.json b/volcanic/grid/summit/deep/tree-info.json
similarity index 100%
rename from volcanic/grid-sources/summit/deep/tree-info.json
rename to volcanic/grid/summit/deep/tree-info.json
diff --git a/volcanic/grid-sources/summit/shallow/gmm-config.json b/volcanic/grid/summit/shallow/gmm-config.json
similarity index 100%
rename from volcanic/grid-sources/summit/shallow/gmm-config.json
rename to volcanic/grid/summit/shallow/gmm-config.json
diff --git a/volcanic/grid-sources/summit/shallow/gmm-tree.json b/volcanic/grid/summit/shallow/gmm-tree.json
similarity index 100%
rename from volcanic/grid-sources/summit/shallow/gmm-tree.json
rename to volcanic/grid/summit/shallow/gmm-tree.json
diff --git a/volcanic/grid-sources/summit/shallow/nn/rate-tree.json b/volcanic/grid/summit/shallow/nn/rate-tree.json
similarity index 100%
rename from volcanic/grid-sources/summit/shallow/nn/rate-tree.json
rename to volcanic/grid/summit/shallow/nn/rate-tree.json
diff --git a/volcanic/grid-sources/summit/shallow/nn/rupture-sets.json b/volcanic/grid/summit/shallow/nn/rupture-sets.json
similarity index 100%
rename from volcanic/grid-sources/summit/shallow/nn/rupture-sets.json
rename to volcanic/grid/summit/shallow/nn/rupture-sets.json
diff --git a/volcanic/grid-sources/summit/shallow/r85/rate-tree.json b/volcanic/grid/summit/shallow/r85/rate-tree.json
similarity index 100%
rename from volcanic/grid-sources/summit/shallow/r85/rate-tree.json
rename to volcanic/grid/summit/shallow/r85/rate-tree.json
diff --git a/volcanic/grid-sources/summit/shallow/r85/rupture-sets.json b/volcanic/grid/summit/shallow/r85/rupture-sets.json
similarity index 100%
rename from volcanic/grid-sources/summit/shallow/r85/rupture-sets.json
rename to volcanic/grid/summit/shallow/r85/rupture-sets.json
diff --git a/volcanic/grid-sources/summit/shallow/source-tree.json b/volcanic/grid/summit/shallow/source-tree.json
similarity index 100%
rename from volcanic/grid-sources/summit/shallow/source-tree.json
rename to volcanic/grid/summit/shallow/source-tree.json
diff --git a/volcanic/grid-sources/summit/shallow/tree-info.json b/volcanic/grid/summit/shallow/tree-info.json
similarity index 100%
rename from volcanic/grid-sources/summit/shallow/tree-info.json
rename to volcanic/grid/summit/shallow/tree-info.json
diff --git a/volcanic/zone-sources/README.md b/volcanic/zone/README.md
similarity index 100%
rename from volcanic/zone-sources/README.md
rename to volcanic/zone/README.md
diff --git a/volcanic/zone-sources/caldera/caldera.csv b/volcanic/zone/caldera/caldera.csv
similarity index 100%
rename from volcanic/zone-sources/caldera/caldera.csv
rename to volcanic/zone/caldera/caldera.csv
diff --git a/volcanic/zone-sources/caldera/caldera.geojson b/volcanic/zone/caldera/caldera.geojson
similarity index 100%
rename from volcanic/zone-sources/caldera/caldera.geojson
rename to volcanic/zone/caldera/caldera.geojson
diff --git a/volcanic/zone-sources/gmm-config.json b/volcanic/zone/gmm-config.json
similarity index 100%
rename from volcanic/zone-sources/gmm-config.json
rename to volcanic/zone/gmm-config.json
diff --git a/volcanic/zone-sources/gmm-tree.json b/volcanic/zone/gmm-tree.json
similarity index 100%
rename from volcanic/zone-sources/gmm-tree.json
rename to volcanic/zone/gmm-tree.json
diff --git a/volcanic/zone-sources/zone-config.json b/volcanic/zone/zone-config.json
similarity index 100%
rename from volcanic/zone-sources/zone-config.json
rename to volcanic/zone/zone-config.json