Rename client and server packages to avoid clashes.
Twine: Rename diff, patch to sym_diff, sym_patch.