README tweaks
API update
client: reorganize code