Further fixing code structure for MVC