moved queries into its own namepace