Additional MVC Reorg