Clean-up the CCL API. Moved some internal structures from ccl.h to