Code cleaned up and committed for reviewing

Before the codereview the code has been cleaned up tested.

• Classnames have been changed according to the _name of the models.
• Classmembers renamed according to the projects specifications
• Some methods changed to private
• Changed comments
• Whitespace removed

We will see what the review brings...