Rename org to identity
Add geolocation