Fixed naming problems and added comments.
Deleted the right file and updated UML.