rearrange files, change paths