added DataPoint, re-organized package structure