Refactor MVC.rb in order to be more modular