Revert "Delete Client.java"

This reverts commit 66cac39b471d670fb720471c918150b5b96127ad.