Adding files and changes for grouping by Date and Type