Minor changes to packages.xml (use groups when possible)