Moved the Query/Filter code to it's own library.