code clean - java package structure cleaned