Refactored java sources