Fixed third task project, splitted to classes