src package structure fix