fixed java tests
Project directory structure fix