Upgrade to maven