moving classes to MVC