Change: Refactor the code. Separate java and groovy sources