Changed whole structure to MVC