Unified both the SearchBuilder and SearchCriteriaService
Continue to merge SearchCriteria2 and GenericSearchBuilder
Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement
Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement
Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement
Added QueryBuilder
Added comments and finished off the work