Change to class structure.