My suggestion to Mike Mearls and the team working on D&D Next over at WotC is "modular, but separate".
The Mage class would still have "Wizardry" and encompass magic systems that are very similar to it such as the High Sorcery in Dragonlance, Preserver magic in Dark Sun, Wild Magic, etc...