Change over to MVC Framwork