rearange and rename some files
rearrange and rename some files