restructured DataPoint to flat
fixed code errors due to DataPoint structure changes