Refactoring, renamed providers -> trees