Update for new CC package structure. Fixes issue #163.