Rearranging - Importer stuff is clearly mostly model code.
Fix for <hr> conversion to hilariously large - repetition.