Rewrite app using MVC