Rearrange the folder structrue