More Group fixes to the new format. Updated list of included Pixi files to remove un-needed ones.