Move client structure into client.h