Start to refactor the TAO tree.