rework file structure