Added new Controller and View classes