Let's move some things around

Change-Id: I982e478ca2bae10f1942f77e028ae37f1b2a065a