Make all changes to #include statements and build files.
First just move the files to make the upcoming commit diff easier to read.