Refactor for Maven