Streamline top-level directory, make benchmarks run