client refactoring to java.util.concurrent

threads model was redone for client
merge