Replace struct with class in headers