src folder structure fix