Refactor into MVC pattern (and lots of previous changes)