GIT: Refactor tree structure