Reorganize patchset

Let's squash and reorganize our patches again.