/contrib index reorg

Cleaner and easier to read.

Reordered by functionality
Merge pull request #4047

494cbf8 /contrib index reorg (super3)