Better organization, benchmarks