rework file organization