Improve visibility of benchmarks

[lcobucci]

This reorganises the benchmark structure, allowing us to have better visibility and more easily filter on groups/variants.