Updating to branch structure to clean up pull requests