Combined VariableSet and DataPoint, moved Nelder-Mead to own class