Replace struct keyword with class where needed