Rename lib/query/ to lib/queries/