move some classes where it makes more sense