Structure refactoring of branch to the master