integrating to Data namespace

- TODO: remove group structure. or regroup the data.