Project structure adjustments