I refactored everything into a MVC