Created modules for geolocation and broadcast
gateway merge