Change file names and tidy before project submission