Reorganize benchmarking system.