Refactored geo models & api's, added some initial data