Done, commented and structured the classes and methods