Importer framework included, template syntax update, a lot of retabbing