Added MVC project, refactored