Redesigning architecture part #3 (tree)