ENH: Restructured tree for consistency