diff --git a/build_all.sh b/build_all.sh
new file mode 100755
index 00000000..32f29313
--- /dev/null
+++ b/build_all.sh
@@ -0,0 +1,5 @@
+# Check the types in everything.
+pytype cabby
+
+# Build everything
+bazel query cabby/... | xargs bazel build
diff --git a/run_all.sh b/run_all.sh
old mode 100644
new mode 100755
index 9a1fbf8e..7a2e8362
--- a/run_all.sh
+++ b/run_all.sh
@@ -1,21 +1,17 @@
 # Check the types in everything.
 pytype cabby
 
-# Build, test and run the cabby.rvs subpackage.
+# RVS
 bazel build cabby/rvs:*
 bazel query cabby/rvs:* | xargs bazel test
 bazel-bin/cabby/rvs/generate_rvs --ref_poi "Empire State Building" --goal_poi "pharmacy"
 
-# Build, test and run the cabby.geo subpackage.
-bazel build cabby/geo:*
-bazel query cabby/geo:* | xargs bazel test
+# Geo
 bazel-bin/cabby/geo/geo_computation --orig_lat 40.749102 --orig_lon -73.984076 -dest_lat 40.748432 --dest_lon -73.982473
 bazel-bin/cabby/geo/map_processing/map_processor --region Pittsburgh --level 18
+bazel-bin/cabby/geo/map_processing/map_processor --region Manhattan --level 18
 
-# This isn't working.
-# bazel-bin/cabby/geo/map_processing/map_processor --region Manhattan --level 18
-
-# Build, test and run the cabby.geo subpackage.
+# Wikidata
 bazel test cabby/data/wikidata:query_test
 bazel build cabby/data/wikidata/extract_geofenced_wikidata_items
 bazel-bin/cabby/data/wikidata/extract_geofenced_wikidata_items --region Pittsburgh
diff --git a/test_all.sh b/test_all.sh
new file mode 100755
index 00000000..46ad6451
--- /dev/null
+++ b/test_all.sh
@@ -0,0 +1 @@
+bazel query cabby/... | xargs bazel test