#47 refactoring Client: move some classes to Base