Change the structure of the Controller and ModelController