More changes on the way to sorting out a common core
Combined the old query builder files
More changes toward common core.