/contrib index reorg

Cleaner and easier to read.

Reordered by functionality