Moved our patchwork to its own internal directories in preparation for a release cleanup