move some classes to separate packages