move some classes and some tidy up