Move Query component out of repo

Change-Id: I1f5982f7e4f7590ac3d14fb4a1c8614694e813a9