Data Layer restructured

Data Layer restructured