switched organization of yiistrap to its bs3 branch structure