Directory tree improved