file structure rearrange and name change