Adapted HtmlFile to new mostly-converted filebase