Updated files to be more MVC