cleanup
first cut of packaging mock-apache + mock-tools; WIP checkpoint