Rework folder structure