Refactored master importer to isolate link building