merge hierarchy code into Tachyon