more file rearrangement