Moving Query class into Query/Select.php