Re-organising includes, adding second header for posts and pages