[skip-ci] Just moving packages around, no need to run CI
And also update patches. See patch files for descriptions.