Refactor for maven