Ensure grails-mode and groovy-mode packages don't overlap