Project modified to conform MVC pattern