Merge "Benchmark have their own folder" into nyc-dev