Revert "Revert "Merge pull request #165 from eksperimental/html_structure""

This reverts commit 2264c7609aeec1a09d014764fae162c1c8036a28.