Re-organized the Client.java