refactor file tree