reordered the hierarchy

for queries