Changed header: deleted old classes and joined new.