Simplify post templates, rename includes