Moved queries into their own namespace.