Initial core/content and core/layout content

Also:
* Clean up content headings in the core section