Cpde reorganized, mage more extensible.