Fixed folder structure in Data layer.