Renaming and re-grouping files