Continue refactoring of the server communication code.
Finished refactoring of server code.  It is now all in a service, rather than a super class.
Fix some refactoring errors.