Adjusted grouping of packages over 2.0