Reorganize Query Builder classes