Move some files so the vanilla kernel builds again.