Revised elementx

Now distinguishes trees and file sets so that they can have overlapping
names, i.e., we can have an "app" tree and an "app" file set.