Moved instances of server/client to new class.