rebasing folders again