Corrected the grouping of some packages.
Merge pull request #82 from flexiondotorg/master

Corrected the grouping of some packages.