Reorganize where we call firefox patches