Reorganize the benchmark's structure