MVC restructred