Refactor

MVC Refactoring