Restructure 2.1 toc

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