package refactor. trying to get jmh benchmarks to run