move some classes within modules