Restructure includes and layouts

Separate head and header and make default and post layouts the same for
now.