Update and rename dsds to Client.java