More reorg due to branching strategy instead of folder strategy