Pushed src down a level, switched to separate latitude and longitude