Migrated .h to .cc and made proper .h files