Major refactoring to allow adding more benchmarks easily. Change-Id: I00e7c900b7383498da28cb9ffdc6fff855c5a581