Reorder and link things a bit.