Importer improvements

Changed some classes and some organization