Refactor to separate the server code from the client code, hopefully …

Refactor to separate the server code from the client code, hopefully … #113