Tree created, controllers refactored