Rename the file names and clean up the code.