Big cleanup + added NwcFileImporter