Add geo_ip_org and refactor geo_ip a bit