Change post format templates from "content-" to "format-"
Change post type templates from "content-" to "type-"
Merge single template
Update get_template_part functions