diff --git a/makefile b/makefile
index 5d59d8a..876a34b 100644
--- a/makefile
+++ b/makefile
@@ -5,40 +5,12 @@ STYLE_BLUEPRINT=webkit
 FORMATTER=clang-format -i -style=$(STYLE_BLUEPRINT)
 
 build-examples:
-	cd examples/01_one_sample && make && echo
-	cd examples/02_many_samples_time_to_botec && make && echo
-	cd examples/03_gcc_nested_function && make && echo
-	cd examples/04_sample_from_cdf_simple && make && echo
-	cd examples/05_sample_from_cdf_beta && make && echo
-	cd examples/06_gamma_beta && make && echo
-	cd examples/07_ci_beta && make && echo
-	cd examples/08_nuclear_war && make && echo 
-	cd examples/09_burn_10kg_fat && make && echo 
-	cd examples/10_nuclear_recovery && make && echo 
-	cd examples/11_algebra && make && echo 
-	cd examples/12_algebra_and_conversion && make && echo 
-	cd examples/13_ergonomic_algebra && make && echo 
-	cd examples/14_twitter_thread_example && make && echo 
-	cd examples/15_plotting-scratchpad && make && echo 
-	cd examples/16_100_lognormal_samples && make && echo 
+	cd examples/core && make all
+	cd examples/more && make all
 
 format-examples:
-	cd examples/01_one_sample && make format && echo
-	cd examples/02_many_samples_time_to_botec && make format && echo
-	cd examples/03_gcc_nested_function && make format && echo
-	cd examples/04_sample_from_cdf_simple && make format && echo
-	cd examples/05_sample_from_cdf_beta && make format && echo
-	cd examples/06_gamma_beta && make format && echo
-	cd examples/07_ci_beta && make format && echo
-	cd examples/08_nuclear_war && make format && echo 
-	cd examples/09_burn_10kg_fat && make format && echo 
-	cd examples/10_nuclear_recovery && make format && echo 
-	cd examples/11_algebra && make format && echo 
-	cd examples/12_algebra_and_conversion && make format && echo 
-	cd examples/13_ergonomic_algebra && make format && echo 
-	cd examples/14_twitter_thread_example && make format && echo 
-	cd examples/15_plotting-scratchpad && make format && echo 
-	cd examples/16_100_lognormal_samples && make format && echo 
+	cd examples/core && make format-all
+	cd examples/more && make format-all
 
 format: squiggle.c squiggle.h
 	$(FORMATTER) squiggle.c