Set up new tree structure
Minor changes