Reorganised project to MVC