Move things around.

Change-Id: Id727a3a907a604987f9e51d0a1a249a44a1f8b89