Swap sections 2 and 3 into more logical order.