begin rebase the DB and project structure