Rename smw.Api.query to smw.Query

Change-Id: I5b33e3472b6a736bff011d45a880c59f4bddc01b