Renaming and change outputkey

- rename classe so that it is more clear
- add longitude and latitude to the output key.