API: Transform into a standalone module instead of a query submodule.

Change-Id: Ia858fa43a50ade947e6353d22dc89a519c3da61a
Merge "API: Transform into a standalone module instead of a query submodule."