Groovy upgrades and a rearrangement of the IntelliJ Idea stuff.