Cleaning and adding Benchmark classes