Having not yet reviewed this code, IIRC, this is all building framework for us to start using the new MVC interfaces.  So theoretically, it could be done in this structure and as other components are adapted they would fall in line.  But, yes, the same class name thing needs to be something we shift away from completely.