Shift grouping of nodes packages to comps.xml instead of requires: in packages.