Refactored structure search, separating out CBL cluster specific code and experiment code