Combined template tags after merge.
Herded reference templates away from blog generic ones.
Combined includes folders.