Reconstructing importer.

Modular, based on extending. Reduces code
duplication.