Adds HtmlImporter to isolate import processing, adds basic unit test, some renames