- refactor move QueryHierarchy.java