folder rename
Lots of changes

attempt at non-blocking send/receive in client, small adjustments in
server