code clean - more java package structure fix