refactor the top-level 'patches' section into a subsection of General Policies.