CORE-347 tree redesign

CORE-347 tree redesign