Added M4 refactoring section and patchset.patch file