Move groovy CLI command from query package to cli