Moving <section> and header tags away from includes

Allows for better flexibility of data.