Refactor code and reorganize files and filenames for POO exam preparation