Renamed packages and new groovy version