Reorganize docinfo and frontmatter