EG: refactored more Java packages;