move some classes