Restructure benchmark layout (prepare to add new benchmarks).

Restructure benchmark layout (prepare to add new benchmarks). #560