change struct to class