Removed client_socket from lib, added an event call back and moved a few defines to the interface