Adds all the files back into groups
Merge branch 'fix/file-grouping' into develop

* fix/file-grouping:
  Adds all the files back into groups