Revised project structure and build includes.