Added Query Builder View Controller as well as renamed the query controller to something that's more in line with what it is... a query