Re-organized/cleaned up the benchmarks directory.