Updated the client to use a class.
Moved client and server code into one module.