Shuffle things around

Change-Id: I24ed80cc0a0cfd9b694c3258a91c14dabc1ef606