Maven Integration and Refactored code.