Changed MVC setup