Refactoring, extracted lifecycle component as a standalone component
Refactoring, extracted tree component as a standalone component