Refactored Data Importer and IndexerData
DataImporter Refactor