Moved MVC functionality to main project.