Format for rst and move things a bit.