Fix path building bug.
Reintroduce client and server.