change one struct to class