Change-Id: Ib7a03973d43828f47ff59b561d9ddce43186f8af
First just move the files to make the upcoming commit diff easier to read.