Rearrange TreeComponent and its children so they add the styles they need, and can
be renamed for easier debugging.