Refactored file tree