MVC structure added
some minor changes