Correct struct and class