Changed package names accordingly and wrote joining handshake for client.