Move client.py into own folder