Changed structure of hmtl documents

References #795