Renaming, reformatting
Add geojson support