Moved some more of the build files around.