Renaming and rearranging some files