moved Benchmark
structure cleanup