Move Query related files into /query/ subdirectory

Files that are query related and store independent have been
moved into /query/

Change-Id: Id2d698542c10ce74bfce4d5b6a5c312c03d17ec9
Merge "Move Query related files into /query/ subdirectory"