Better support for groovy packages.