Add header file and use it

Have the build system use the new header file
Move cci.h to it