Even more organization of headers, content