Refactor whole project for combine.