Refactored file tree.