restructured whole branch