Moved things around

Change-Id: Ie78d78bd9bdff6084c86ae23c01eaa851fa2cc4b