Restructured ActiveDelegatePackageProvider to prefer Composite over
Collection