Some gratuitous Groovy sugar
Restructure the packages