refactoring: move some classes