Revert "Merge pull request #1 from d1ngell/mvc"

This reverts commit c3c04cee9a119bb811b0e2c439ae07472993f4bb, reversing
changes made to 7aafb96e0b956ce8ceb0c828e7401eb86d926b15.