Refactored the "nat" and "rendezvous" submodules