Move some things around

Change-Id: I0649ed9643452cab886940c960c1e808b596c5d8