Update autogen scripts and templates for restructuring

The gen-formats-pages and gen-meta-support targets were also run, but
both resulted in no changes (since no new formats were introduced after
rc2).