cleanup file organization