Reorganized the github branch for convenience