diff --git a/.gitignore b/.gitignore
index a4a3691..53fdbfa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,3 @@
-data/TOPS/*
-basemaps/*
-figures/school_maps/*
-figures/municipalities/*
-api_keys/*
-basemaps/*
 .Rproj.user
 .Rhistory
-other/districts_done.csv
+districts_done.csv
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..00cc984
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+osrm: osrm-data osrm-containers
+
+crashmaps_pdf: route_analysis.Rmd
+	R -e 'library("rmarkdown"); old_path <- Sys.getenv("PATH"); Sys.setenv(PATH = paste(old_path, "/usr/local/bin", sep = ":")); rmarkdown::render(knit_root_dir = "./", output_dir = "./html", input = "./R/route_analysis.Rmd", output_file = "./html/route_analysis.html")'
+
+crashmaps_dynamic: cycle_brouter
+
+osrm-data:
+	cd ./docker/osrm/; wget https://download.geofabrik.de/north-america/us/wisconsin-latest.osm.pbf -O ./data-raw/wisconsin-latest.osm.pbf
+	cd ./docker/osrm/; docker run --rm -t -v "./data-foot:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-extract -p /opt/foot.lua /data/wisconsin-latest.osm.pbf
+	cd ./docker/osrm/; docker run --rm -t -v "./data-foot:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-partition /data/wisconsin-latest.osrm
+	cd ./docker/osrm/; docker run --rm -t -v "./data-foot:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-customize /data/wisconsin-latest.osrm
+
+osrm-containers: ./docker/osrm/docker-compose.yml
+	cd ./docker/osrm/; docker compose up -d
diff --git a/scripts/city_maps.R b/R/city_maps.R
similarity index 100%
rename from scripts/city_maps.R
rename to R/city_maps.R
diff --git a/scripts/crash_summaries.R b/R/crash_summaries.R
similarity index 100%
rename from scripts/crash_summaries.R
rename to R/crash_summaries.R
diff --git a/scripts/crash_summary_charts.R b/R/crash_summary_charts.R
similarity index 100%
rename from scripts/crash_summary_charts.R
rename to R/crash_summary_charts.R
diff --git a/scripts/dynamic_crash_map.R b/R/dynamic_crash_map.R
similarity index 100%
rename from scripts/dynamic_crash_map.R
rename to R/dynamic_crash_map.R
diff --git a/scripts/dynamic_crash_map_milwaukee.R b/R/dynamic_crash_map_milwaukee.R
similarity index 100%
rename from scripts/dynamic_crash_map_milwaukee.R
rename to R/dynamic_crash_map_milwaukee.R
diff --git a/scripts/municipality_maps.R b/R/municipality_maps.R
similarity index 100%
rename from scripts/municipality_maps.R
rename to R/municipality_maps.R
diff --git a/scripts/school_maps.R b/R/school_maps.R
similarity index 100%
rename from scripts/school_maps.R
rename to R/school_maps.R
diff --git a/scripts/school_maps_parallel.R b/R/school_maps_parallel.R
similarity index 100%
rename from scripts/school_maps_parallel.R
rename to R/school_maps_parallel.R
diff --git a/api_keys/.gitignore b/api_keys/.gitignore
new file mode 100644
index 0000000..5e7d273
--- /dev/null
+++ b/api_keys/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/basemaps/.gitignore b/basemaps/.gitignore
new file mode 100644
index 0000000..5e7d273
--- /dev/null
+++ b/basemaps/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 0000000..5e7d273
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/data/Schools/WI_schools.gpkg b/data/Schools/WI_schools.gpkg
deleted file mode 100644
index c255ffd..0000000
Binary files a/data/Schools/WI_schools.gpkg and /dev/null differ
diff --git a/data_summaries/.gitignore b/data_summaries/.gitignore
new file mode 100644
index 0000000..5e7d273
--- /dev/null
+++ b/data_summaries/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/docker/.gitignore b/docker/.gitignore
new file mode 100644
index 0000000..c9615a6
--- /dev/null
+++ b/docker/.gitignore
@@ -0,0 +1,7 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
+!docker-compose.yml
+!data-raw/
+!data-foot/
diff --git a/figures/.gitignore b/figures/.gitignore
new file mode 100644
index 0000000..5e7d273
--- /dev/null
+++ b/figures/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/html/.gitignore b/html/.gitignore
new file mode 100644
index 0000000..5e7d273
--- /dev/null
+++ b/html/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/other/BFW_Logo_180_x_200_transparent_background.png b/icons/BFW_Logo_180_x_200_transparent_background.png
similarity index 100%
rename from other/BFW_Logo_180_x_200_transparent_background.png
rename to icons/BFW_Logo_180_x_200_transparent_background.png
diff --git a/other/school_FILL0_wght400_GRAD0_opsz24.png b/icons/school_FILL0_wght400_GRAD0_opsz24.png
similarity index 100%
rename from other/school_FILL0_wght400_GRAD0_opsz24.png
rename to icons/school_FILL0_wght400_GRAD0_opsz24.png
diff --git a/other/school_FILL0_wght400_GRAD0_opsz24.svg b/icons/school_FILL0_wght400_GRAD0_opsz24.svg
similarity index 100%
rename from other/school_FILL0_wght400_GRAD0_opsz24.svg
rename to icons/school_FILL0_wght400_GRAD0_opsz24.svg