Work started @ MVC architecture refactoring