Changes suggested in #6
Grouping files is in collection is optional