move some classes to another package