Refactor branch files
Fixed branch_all