RF: Sub-trees are named by their short_name. Refactored query module to make

more sense, and to make it easier to un-ambiguouosly identify the location
of a Match in a filetree hierarchy