modified a little with Client.java,  add some class in master package