More CCA code reorganization.