Organize imports in Client.java