Refactored Java Packages