Restructure benchmarks