Refactor new MVC structure