rearrange files from v1 layout to v2 layout