Remodel with MVC.
Merge pull request #5 from orikie/Joe

Remodel with MVC.