Rebase after reorganizing files