#1513 project structure changes