Move the opening and closing bedework element out of the header and footer files.

Avoids a problem with intellij which doesn't like the extra closing element.