move some more global classes into common