rework folder structure