rename server to client
final things to prepare it for submission