Rebase project to current status