Moved sections around.

Change-Id: Ide14d01cb36c4176448dbbaae766a29b80d0af1f