Extracting server and client classes into their own files