Begin refactor of queryBuilder

Builder class no longer takes yaml configuration files. Strings are
hardcoded into the class.