added some MVC organization