Rename xs_bench to bench

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Rename xs_client_cli to cli

Signed-off-by: David Scott <dave.scott@eu.citrix.com>