Refactor only: add a new module for BenchSpace