[generic] Reorganize patches