Switch to new branch system

Switch as mentioned in #69