Upgrade to Maven project