Streamline top-level directory, make benchmarks run
Merge pull request #564 from garborg/cleandir

Streamline top-level directory, make benchmarks run