Minor tweaks
Some moving around of classes