Perhaps this is a little clearer?
Move some code into new WireFormats module.
Refactor contents server, add two-way WireFormat class.