Merge PeerAddr and NodeAddr modules