rearrange folders and packages