v1.1 Refactored View/Model controllers

Refactored code to separate View from Model controllers.