Separate model and controllers

Rework the code to we follow the model-view-controller design pattern

changed milestone to %Final iteration

added Testing and integration label

closed

removed Testing and integration label