Refactor benchmarks into competencies