Began filetree refactor.