move some classes to own files