added grouping of files