Removed rel directory from echo_server and added to calculator