Swapped around some key mappings. Some reorg.