Personal preference: let's keep the entire patchset in one file, to make it slightly easier to rebase.