Bundles changed from Ensemble to set
Ensembles refacted out (for Bundles and related)