New generalized tree search; add some files forgotten by previous commits