model/view/controller refactoring complete.