Change some declarations from 'struct' to 'class' (and vice-versa)