Removed the old Client, renamed ClientApi to Client + added ClientApi
interface