Moved ProjectBuilder to dedicated project