Tidy up the source tree, group related classes