Dinosaur/Importer Refactoring.