Use Groovy 2.3.0-SNAPSHOT so we get Closure Parameter Hinting. Refactor a few packages.