refactorings

 * Moved Client inner classes to proper classes
 * Encapsulated some members of Client
Merge branch 'master' of github.com:xing/java-beetle