Refactor name of client.py to make more sense