Rearranged things

No real changes.