Rearrange the files to use better grouping.