Reorganize patches