Move Client into client.py