re-base project a bit