Changed group names as discussed on IRC
Moved toctrees to section index