Merge branch 'restructure-tree'