Back to basics; we need branches instead of folders