Maven code refactoring