Rename files to improve organisation