Restructure of Data layer.