P04: Refactoring  Renaming files to comply

with professor's requirements