change struct for classes