Improving project structure