Add other fields for source.properties
Fix grouping of packages by name