Restructured toolset tree, Many refinements.