The fact that every aggregation has its own package requires to make too many classes public. We should look into collapsing packages and making as many classes package-private as possible. Ideally we'd do this close to the 6.0 release to keep backporting easy.