State classes split in individual headers