Move benchmarks into a single package

[peterstace]

Benchmarks are currently all over the place (some in a single package, and others in their own package).

These should all be moved to a central location.