Added task 2 and refactor the name of the classes