Modify server.class and client.class
make them a more generic class
server classes modified