Rearrange classes in ServerClientDemo in anticipation of splitting client/server.