Refinement of the data folder structure.