Project structure fix