Refactor to use Maven