Some moving around of patches
Fix directories in rebuild-patches