[refactoring] moving classes into package client and marking classes
package private