Restructure
New way to generate trees