Restructure to be based on branch.

Signed-off-by: crynobone <crynobone@gmail.com>
Prepare 2.1 branch.

Signed-off-by: crynobone <crynobone@gmail.com>