Revert "A lot of housekeeping in the code."

This reverts commit ba05164da3725afce8783ea2d5f7e953e623e1ca.
Revert "Reworked parsing of HTML and the infrastructure to recognize includes. "

This reverts commit 0aeed4b8077c7fd0a1ba3a4b7eb9e6b82a5ad468.