Rebuild patches - move some refresh patches to separate dir for later