reorganize to group by benchmark type

This also adds some future benchmarks I want to measure.

/cc @jcredding