Rearrange file structure