Fixing messed up tree structure
Updating docs