rearranging files and renaming