Revert "Organizing ((different branches))"

This reverts commit f482d0177cf728fd99ec182efc583fc8215f3106.