Move all section handling to its own file automerge: f7e9207
automerge: e2cd612

* commit 'e2cd6126884f90ef06ad7c1d9de82da0e91a744c':
  Move all section handling to its own file