Re-arranging things in a slightly more intuititve layout.