Moving client to clientLib