Organize our patches and prepare for rebase

Before we rebase, we should see if we can reorganize our patches into better functional groups, and make a note of what in-tree tests currently fail before the switch.