rearrange files
merge