Refactored the rpc-map into the rpc namespace.