Moved a few things around.

No code changes.