Corrected the grouping of some packages.