Fixed class_structs not being in the right order