Revert "Split into master/branch folders"

This reverts commit 8c233b4ded0de0f68d55b53a3a5393942c993e6d.