Restructure the benchmark