Start breaking up .cc and .h