Improved importer class with general methods.
Completed the aviv importer.