Changed structure so that it doesn't need to include Client.h in header file