Reorganize filenames