Renaming correctly some files and completing the assignment