Going lightweight MVC
New MVC layout
Fixed merge conflict.