Fixed project structure
[#69049268]