move client data to lib/client