Made this easier to make run in new environments. Also, refactored
imports as Groovy now seems to do this correctly.