Initial restructure as the CDD from CCDBuilder.