[OOP] Fixed files

Tasks 5-10 from [OOP] - Defining classes - Part II