Rebasing folder