Maven refactor