Reorganize patches
More changes