catkinized the package for use in groovy and beyond