Reorder classes

#43