More refactoring.

Grid class to hold a grid
altitude doesn't belong to the grid
Inner waypoitns is a urveyData parameter