EG: refactored all Super/SubCollectors; now added files